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

[Blair Zajac]

Raman Gupta wrote:
> 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.

The current behavior could be thought of as sub-optimal from a merging 
standpoint (not from a performance point of view), so maybe we should enable it 
by default and add an option to disable the bi-directional support could be made 
as an optimization, for those people that know they don't need it.

In our environment, we will need them most of the time, so it would be nice if 
it was always enabled.

Regards,
Blair