[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: some subversion issues

From: maheshwar singh <maheshwars_at_hotmail.com>
Date: Tue, 27 May 2008 09:22:46 +0000

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
Received on 2008-05-27 11:23:10 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.