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

merge-tracking branch: merge of merge properties

From: Madan U Sreenivasan <madan_at_collab.net>
Date: 2006-07-07 14:11:06 CEST

Hi,

    I beleive that the current merge of merge properties is has to be
improved. Am working on that. I want to sound my ideas here for your
suggestions.

for example:

@r12:
svn:mergeinfo on /branches/branch1: /trunk: 3-5,6

Step 1:
cp /branches/branch1 /branches/branch2
@r13
svn:mergeinfo on /branches/branch2: /trunk: 3-5,6

Step 2:
merge /trunk -r 9-13 (into /branches/branch1)
@r14
svn:mergeinfo on /branches/branch1: /trunk: 3-5, 6, 10-13

Step 3:
merge /branches/branch1 -r13:14 (into /branches/branch2)
@r15
svn:mergeinfo on /branches/branch2: /trunk: 3-5,6
                                                          /branches/branch1:
14

I expect it to be:
@r15
svn:mergeinfo on /branches/branch2: /trunk: 3-5, 6, 10-13
                                                          /branches/branch1:
14

     By doing this, revisions available for merges from /trunk into
/branches/branch2 could be resolved by just looking up for the trunk merge
status in /branches/branch2. Otherwise, we might have to refer to
/branches/branch1@r14.

     Please give your feedback on the same.

Regards,
Madan.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 7 13:42:31 2006

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