[Svnmerge] [PATCH] Bidirectional merging patch for svnmerge.py

[Raman Gupta]

Attached is a bidirectional merging patch for the latest version of
svnmerge.py (rev 238).  It removes reflected revisions (i.e. changes on
the branch that were originally merged from the target, and therefore
should generally not be merged back into the target) from the
available/merge list. Reflected revisions can cause spurious conflicts
if any changes were made to the merged code on the branch.

This patch differs from my bidi patch to the original svnmerge by not
using dot-files to store the merge revisions. It instead uses Archie's
suggestion of checking the svnmerge integrated property. The upside to
this is that no dot-files are required, the downside is that it is slow
because it requires a remote svn diff call for each possible revision to
be merged.

Because it can be slow, and because it is only required in special
situations (bidi merging), by default the reflected revision check is
not done. I have added an option "-b" or "--bidi" to the avail and merge
commands that must be specified if the user wishes to check for
reflected revisions.

Cheers,
Raman Gupta
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bidi.patch
Type: text/x-patch
Size: 9007 bytes
Desc: not available
Url : /pipermail/svnmerge/attachments/20060219/a6a39cfc/attachment.bin