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

[Subclipse-users] sequential merging

From: D'Souza, Stalin [SB] <stalin.dsouza_at_citigroup.com>
Date: 2006-10-04 20:47:35 CEST

I have branch A copied from trunk.
I have branch B copied from branch A (after A has advanced several
revisions).
 
Now A and B are two lines of development, but I periodically merge
changes from A to B to keep B up to date (for the eventual merge of B
back to A and the retirement of B).
 
So I merge sequentially from the last merge to latest. i avoid using
HEAD to keep track of the merge revisions..
 
merge svn -r 100:140 ...
 
<few days/weeks pass>
 
merge svn -r 141:180 ...
 
<few days/weeks pass>
 
merge svn -r 181:200 ...
 
Is it correct to increment the numbers as in the example, or should i
repeated the 'boundary' revisions.
 
merge svn -r 100:140 ...
 
<few days/weeks pass>
 
merge svn -r 140:180 ...
 
<few days/weeks pass>
 
merge svn -r 180:200 ...
 
What is the inclusivity/exclusivity conditions of the revision range? I
once lost changes in branch A when I did the revision-increment style
merge.
 
 
OS: winxp sp1
subversion 1.3.x
subclipse 1.1.6
eclipse 3.2
 
 

--------------------------------------------
Stalin D'Souza
212-657-0752 stalin.dsouza@citigroup.com
Citigroup - Global Wealth Management - Smith Barney Technology
111 Wall Street 17th Floor New York, NY 10005

 
Received on Wed Oct 4 20:51:56 2006

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

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