[Svnmerge] Patch for non-reflected bidirectional merging support

Archie Cobbs archie at dellroad.org
Fri Aug 26 12:43:15 PDT 2005


Raman Gupta wrote:
>>Here "." is the branch (i.e., target) directory for the merged changes.
>>This just tells us which revisions actually changed the target branch,
>>as opposed to revisions which made changes outside of the target branch.
>>
>>Then, we simply omit these changes from whatever revisions we're going to
>>merge in. Voila, "reflected" changes are never merged in.
> 
> Hmm, I'm not sure I understand this. Excluding revisions from the target
> is meaningless because svn merge automatically excludes those. Its the
> merge-points on the source that need to be excluded. Or have I
> misunderstood your intent?

D'oh! Nevermind, you're right, I had gotten things confused.
Ignore that email.

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com



More information about the Svnmerge mailing list