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

Re: Understanding Reflective/Cyclic Merges

From: Folker Schamel <schamel23_at_spinor.com>
Date: 2007-11-17 20:30:49 CET

Mark Phippard wrote:
> Now, let me take a brief pause to say that there is a problem here
> that is currently not fixable. Our merge algorithm is based on
> including or excluding entire revisions. So while it would be an
> improvement to filter out those merges from trunk that CMike made,
> that also means that we will be filtering out the conflict resolution
> work that he did as part of synching his branch with trunk.

Idea: This can be solved in the following way:
Instead of excluding reflected revisions, the original reflected revisions
are un-merged in reverse order before doing the requested merge.

branch-wc$svn merge -c10 ^/trunk
-> (trunk,10) is added to mergeinfo of branch
branch-wc$make changes (e.g. confliction resolution) to branch-wc
branch-wc$svn commit
-> r20
trunk-wc$svn merge -c20 ^/branch
-> Instead of excluding c20, this would first merge c-10, and then merge r20
so that it effectively merges the conflict resolution changes only.

Then, if I am not wrong,
trunk-wc$svn merge ^/branches/mergeinfoless-copies
would be (assuming no conflicts) basically equivalent to
trunk-wc$svn merge ^/trunk@LAST-SYNCED-REV ^/branches/mergeinfoless-copies

Cheers,
Folker

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Nov 17 20:31:36 2007

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