You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by maheshwar singh <ma...@hotmail.com> on 2008/05/27 07:38:14 UTC
some subversion issues
Hi,
to all the Subversion guru's out there.
I use subversion as a versioning system for all our sales content. The content usually includes materials like PPT, PDF, DOC etc.I'm running into a few issues and have pasted them here, hoping for a response. I know subversion is optimised for this workflow, but want to use it as manual backups is causing a lot of grief.
Sorry for the long email
Q1:
Does Subversion allow non-linear editing of versionscreate v1 -> put in VMS v1edit v1 to make v2 -> put in VMS v2edit v2 to make v3 -> put in VMS v3realise v3 is a mistake; get v2 from VMS to editso now system looks like: Local version v2 ; VMS version v3edit v2 to make v4 (or a new v3 depending on semantics) -> put in VMS**after adding to subversion I cannot see this version that I have added - where is it? I cannot get itif i look at history i see the 3 original versions - there is NO version 4 & the version 3 is the original version 3;if i say Get Latest Version or get v3 I get the original v3
Q2.
How can i lock a file or make other users aware that the file has been checked out by User A.I know subversion does not allow locking, i'm looking for any mechanism available that will warn User 1 that User 2 has checked out the file, User 1 can then call User 2 about the changes.
Q3.
I delete a file from the local system due to a mistake, is there any way i can get a list of objects that exist in the subversion repository and not in the local system.
Q4.When 2 users are have requested for latest version of same document and working on 2 different changesExample in a Sales Revenue reportUser 1 - Add Margin to the reportUser 2 - Add Discount to the reportBoth change are check in at the same time by the respective users. Only one user change is reflected and the other user change is lost. Is subversion able to resolve the conflict and allow users to Version all changes
thanks
Maheshwar
_________________________________________________________________
Timely update on all current affairs, sports, events and all thats in News here on MSN videos.
http://video.msn.com/?mkt=en-in
Re: some subversion issues
Posted by Ulrich Eckhardt <ec...@satorlaser.com>.
On Tuesday 27 May 2008, maheshwar singh wrote:
> Q1:
> Does Subversion allow non-linear editing of versionscreate v1 -> put in VMS
> v1edit v1 to make v2 -> put in VMS v2edit v2 to make v3 -> put in VMS
> v3realise v3 is a mistake; get v2 from VMS to editso now system looks like:
> Local version v2 ; VMS version v3edit v2 to make v4 (or a new v3 depending
> on semantics) -> put in VMS**after adding to subversion I cannot see this
> version that I have added - where is it? I cannot get itif i look at
> history i see the 3 original versions - there is NO version 4 & the version
> 3 is the original version 3;if i say Get Latest Version or get v3 I get the
> original v3
I'm not clear what you mean here. If you actually check in three files foo1,
foo2 and foo3, they are treated as different files by SVN, even if they
represent different versions of the same file. In order to get SVN to version
them, you need to use the same name.
> Q2.
> How can i lock a file or make other users aware that the file has been
> checked out by User A.I know subversion does not allow locking, i'm looking
> for any mechanism available that will warn User 1 that User 2 has checked
> out the file, User 1 can then call User 2 about the changes.
You can't. Any use could check out as many working copies as they want. They
could even copy the working copy locally without the repository (as central
point for all users) even knowing. Or they could delete them, without the
repository knowing either. Why would you need that?
> Q3.
> I delete a file from the local system due to a mistake, is there any way i
> can get a list of objects that exist in the subversion repository and not
> in the local system.
See the 'ls' and 'status' commands.
> Q4.When 2 users are have requested for latest version of same document and
> working on 2 different changesExample in a Sales Revenue reportUser 1 - Add
> Margin to the reportUser 2 - Add Discount to the reportBoth change are
> check in at the same time by the respective users.
Two users can't check in at the same time. Checkins are atomic and they are
serialised, i.e. one will be the first, the other will be the second to check
in.
> Only one user change is reflected and the other user change is lost.
No, one will commit their changes and the others will be told to first update
their working copy. Note that in the case of most binary formats SVN won't be
able to merge in the changes during an update, so it requires manual
interaction to merge. I suggest using locking on non-mergable files.
BTW: the formatting of your mail is pretty messed up. My guess is that it
still looks okay in the HTML part (which, according to the guidelines you
shouldn't have used in the first place) but is broken in the text part.
cheers
Uli
--
ML: http://subversion.tigris.org/mailing-list-guidelines.html
FAQ: http://subversion.tigris.org/faq.html
Docs: http://svnbook.red-bean.com/
Sator Laser GmbH
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
subversion issues
Posted by maheshwar singh <ma...@hotmail.com>.
Hi, to all the Subversion guru's out there. I use subversion as a versioning system for all our sales content. The content usually includes materials like PPT, PDF, DOC etc.I'm running into a few issues and have pasted them here, hoping for a response. I know subversion is optimised for this workflow, but want to use it as manual backups is causing a lot of grief. Sorry for the long email Q1:Does Subversion allow non-linear editing of versionscreate v1 -> put in VMS v1edit v1 to make v2 -> put in VMS v2edit v2 to make v3 -> put in VMS v3realise v3 is a mistake; get v2 from VMS to editso now system looks like: Local version v2 ; VMS version v3edit v2 to make v4 (or a new v3 depending on semantics) -> put in VMS**after adding to subversion I cannot see this version that I have added - where is it?
I cannot get it, if i look at history i see the 3 original versions - there is NO version 4 & the version 3 is the original version 3; if i say Get Latest Version or get v3 I get the original v3
The commands i have used in my program are:Add Resource:This is a combination of three commands, svn add $1 $2 $1- path of the resource to be added. (In all the cases below, it refers to the location of the resource in the workspace) svn commit $1 –m “$2” $1- path of the resource to be added.$2 – message to be passed by the user. svn update $1 $1- path of the resource to be updated. Checkin resource: svn commit $1 –m “$2” Get latest revision: svn update $1 Get revision: svn update $1 --revision $2 $1- path of the resource to be updated $2- the revision number of the resource that is to be obtained Q2.How can i lock a file or make other users aware that the file has been checked out by User A.I know subversion does not allow locking, i'm looking for any mechanism available that will warn User 1 that User 2 has checked out the file, User 1 can then call User 2 about the changes.What i need is a ability to warn User B about a ongoing modification to a original document by User A
Q3.I delete a file from the local system due to a mistake, is there any way i can get a list of objects that exist in the subversion repository and not in the local system.Get file history: svn log $1 –xml –verbose $1- the repository URL location of the resource. Checkout a workspace(done for the first time): svn checkout $1 $2 –N $3$1- the repository URL location of the resource. $2- workspace path of the resource. $3- authorization parameters. Get workspace revision:svn status $1 –xml –verbose $1- workspace path of the resource.
Q4. When 2 users are have requested for latest version of same document and working on 2 different changesExample in a Sales Revenue reportUser 1 - Add Margin to the reportUser 2 - Add Discount to the reportBoth change are check in at the same time by the respective users. Only one user change is reflected and the other user change is lost. Is subversion able to resolve the conflict and allow users to Version all changes thanksMaheshwar
Placements ? No Problem. Register Here! Try it!
Live.in : Get your yourname@live.in email id today. Powered by Windows Live Hotmail. Check it out!
_________________________________________________________________
2000 Placements last year. Are You next ? Find out
http://ss1.richmedia.in/recurl.asp?pid=499
RE: some subversion issues
Posted by maheshwar singh <ma...@hotmail.com>.
Hi Jean,
thanks for the responseMy answers below
Q1:R: If you did a reverse merge (from v3 to v2) before editing v2 to get v4 then you will see v1,2,3,4.What is the revision number after commiting v4?If you really need a non-linear editing, you should consider the svn copy command to branch out.
M: The commands i have used in my program are:
Add Resource:
This is a combination of three commands,
svn add $1 $2 $1- path of the resource to be added. (In all the cases below, it refers to the location of the resource in the workspace)
svn commit $1 –m “$2” $1- path of the resource to be added.
$2 – message to be passed by the user.
svn update $1 $1- path of the resource to be updated.
Checkin resource:
svn commit $1 –m “$2”
Get latest revision:
svn update $1
Get revision:
svn update $1 --revision $2
$1- path of the resource to be updated
$2- the revision number of the resource that is to be obtained
Q2.R: Subversion does allow locking (please read red-bean).Beware of the terminology: checkout in some VCS means get a copy + lock, that what you meant I believe. Not with subversionM: What i need is a ability to warn User B about a ongoing modification to a original document by User A.
Q3.R: try svn status -hM: These are the commands used
Get file history:
svn log $1 –xml –verbose $1- the repository URL location of the resource.
Checkout a workspace(done for the first time):
svn checkout $1 $2 –N $3
$1- the repository URL location of the resource.
$2- workspace path of the resource.
$3- authorization parameters.
Get workspace revision:
svn status $1 –xml –verbose $1- workspace path of the resource.
Q4.R: Yes/No depending on: if it is a text file for not. If is a text file: yes. If it can't, it will set a flag to need to be resolved to warn you.M: The document in this case may be a report object (crystal Report) or a PDF file. Can i resolve this?
Jean-Claude Antoniowww.arcetis.commaheshwar singh a écrit :
Hi, to all the Subversion guru's out there. I use subversion as a versioning system for all our sales content. The content usually includes materials like PPT, PDF, DOC etc.I'm running into a few issues and have pasted them here, hoping for a response. I know subversion is optimised for this workflow, but want to use it as manual backups is causing a lot of grief. Sorry for the long email Q1:Does Subversion allow non-linear editing of versionscreate v1 -> put in VMS v1edit v1 to make v2 -> put in VMS v2edit v2 to make v3 -> put in VMS v3realise v3 is a mistake; get v2 from VMS to editso now system looks like: Local version v2 ; VMS version v3edit v2 to make v4 (or a new v3 depending on semantics) -> put in VMS**after adding to subversion I cannot see this version that I have added - where is it? I cannot get itif i look at history i see the 3 original versions - there is NO version 4 & the version 3 is the original version 3;if i say Get Latest Version or get v3 I get the original v3 Q2.How can i lock a file or make other users aware that the file has been checked out by User A.I know subversion does not allow locking, i'm looking for any mechanism available that will warn User 1 that User 2 has checked out the file, User 1 can then call User 2 about the changes. Q3.I delete a file from the local system due to a mistake, is there any way i can get a list of objects that exist in the subversion repository and not in the local system. Q4.When 2 users are have requested for latest version of same document and working on 2 different changesExample in a Sales Revenue reportUser 1 - Add Margin to the reportUser 2 - Add Discount to the reportBoth change are check in at the same time by the respective users. Only one user change is reflected and the other user change is lost. Is subversion able to resolve the conflict and allow users to Version all changes thanksMaheshwar
Placements ? No Problem. Register Here! Try it!
_________________________________________________________________
Catch the latest fashion shows, get beauty tips and learn more on fashion and lifestyle.
http://video.msn.com/?mkt=en-in
Re: some subversion issues
Posted by Jean-Claude Antonio <jc...@arcetis.com>.
Q1:
R: If you did a reverse merge (from v3 to v2) before editing v2 to get
v4 then you will see v1,2,3,4.
What is the revision number after commiting v4?
If you really need a non-linear editing, you should consider the svn
copy command to branch out.
Q2.
R: Subversion does allow locking (please read red-bean).
Beware of the terminology: checkout in some VCS means get a copy + lock,
that what you meant I believe. Not with subversion
Q3.
R: try svn status -h
Q4.
R: Yes/No depending on: if it is a text file for not. If is a text file:
yes. If it can't, it will set a flag to need to be resolved to warn you.
*Jean-Claude Antonio*
www.arcetis.com
maheshwar singh a écrit :
> Hi,
>
> to all the Subversion guru's out there.
>
> I use subversion as a versioning system for all our sales content. The
> content usually includes materials like PPT, PDF, DOC etc.
> I'm running into a few issues and have pasted them here, hoping for a
> response.
> I know subversion is optimised for this workflow, but want to use it
> as manual backups is causing a lot of grief.
>
> Sorry for the long email
>
> Q1:
> Does Subversion allow non-linear editing of versions
> create v1 -> put in VMS v1
> edit v1 to make v2 -> put in VMS v2
> edit v2 to make v3 -> put in VMS v3
> realise v3 is a mistake; get v2 from VMS to edit
> so now system looks like: Local version v2 ; VMS version v3
> edit v2 to make v4 (or a new v3 depending on semantics) -> put in VMS
> **after adding to subversion I cannot see this version that I have
> added - where is it? I cannot get it
> if i look at history i see the 3 original versions - there is NO
> version 4 & the version 3 is the original version 3;
> if i say Get Latest Version or get v3 I get the original v3
>
> Q2.
> How can i lock a file or make other users aware that the file has been
> checked out by User A.
> I know subversion does not allow locking, i'm looking for any
> mechanism available that will warn User 1 that User 2 has checked out
> the file, User 1 can then call User 2 about the changes.
>
> Q3.
> I delete a file from the local system due to a mistake, is there any
> way i can get a list of objects that exist in the subversion
> repository and not in the local system.
>
> Q4.
> When 2 users are have requested for latest version of same document
> and working on 2 different changes
> Example in a Sales Revenue report
> User 1 - Add Margin to the report
> User 2 - Add Discount to the report
> Both change are check in at the same time by the respective users.
> Only one user change is reflected and the other user change is lost.
> Is subversion able to resolve the conflict and allow users to Version
> all changes
>
> thanks
> Maheshwar
>
> ------------------------------------------------------------------------
> Placements ? No Problem. Register Here! Try it!
> <http://ss1.richmedia.in/recurl.asp?pid=498>
Re: some subversion issues
Posted by Ryan Schmidt <su...@ryandesign.com>.
On May 27, 2008, at 02:38, maheshwar singh wrote:
> I use subversion as a versioning system for all our sales content.
> The content usually includes materials like PPT, PDF, DOC etc.
> I'm running into a few issues and have pasted them here, hoping for
> a response.
> I know subversion is optimised for this workflow, but want to use
> it as manual backups is causing a lot of grief.
>
> Sorry for the long email
>
> Q1:
> Does Subversion allow non-linear editing of versions
> create v1 -> put in VMS v1
> edit v1 to make v2 -> put in VMS v2
> edit v2 to make v3 -> put in VMS v3
> realise v3 is a mistake; get v2 from VMS to edit
> so now system looks like: Local version v2 ; VMS version v3
> edit v2 to make v4 (or a new v3 depending on semantics) -> put in VMS
> **after adding to subversion I cannot see this version that I have
> added - where is it? I cannot get it
> if i look at history i see the 3 original versions - there is NO
> version 4 & the version 3 is the original version 3;
> if i say Get Latest Version or get v3 I get the original v3
What's "VMS"? Is that your Subversion repository?
I'm really going to need to see some actual svn commands here, their
output, what you expected to get instead, etc. Your version of svn
and what OS you're running on are important too for our comprehension.
> Q2.
> How can i lock a file or make other users aware that the file has
> been checked out by User A.
> I know subversion does not allow locking, i'm looking for any
> mechanism available that will warn User 1 that User 2 has checked
> out the file, User 1 can then call User 2 about the changes.
Subversion does offer locking. Here's the chapter in the book:
http://svnbook.red-bean.com/en/1.4/svn.advanced.locking.html
> Q3.
> I delete a file from the local system due to a mistake, is there
> any way i can get a list of objects that exist in the subversion
> repository and not in the local system.
You can use "svn status" in your working copy to see what files have
been scheduled for removal (e.g. you used "svn rm foo") and also
files which Subversion finds to be unexpectedly missing (e.g. you
used "rm foo").
> Q4.
> When 2 users are have requested for latest version of same document
> and working on 2 different changes
> Example in a Sales Revenue report
> User 1 - Add Margin to the report
> User 2 - Add Discount to the report
> Both change are check in at the same time by the respective users.
> Only one user change is reflected and the other user change is
> lost. Is subversion able to resolve the conflict and allow users to
> Version all changes
The first user to commit will have the commit accepted. The second
user will be told their working copy is out of date. The second user
will need to "svn update". At this point Subversion will try to merge
the changes from the repository into the working copy. If the file in
question is a text file, Subversion will often succeed. But if the
file is binary, Subversion will not attempt a merge, and will just
leave you with the original file, your changed file, and the new file
from the repository, and will mark the file as being in conflict. The
second user now opens these three versions of the file and manually
resolves the conflict. For binary files, it's best if users do not
simultaneously edit, since manually merging binary files can be
tough. Locking files beforehand, and using svn:needs-lock, can
minimize simultaneous editing.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org