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

[Blair Zajac]

Giovanni Bajo wrote:
> Raman Gupta <rocketraman at fastmail.fm> 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.
> 
> 
> Hi Raman, thanks for the patch. I don't feel very fond of this feature because
> I don't think it really solves anything, but I'm not going to stay in its way.

Well, I'm a frequent user of this.  We have a team of people who work in 
per-user branches and always need to merge to/from trunk, and without it, it 
gets to be a pain :)

Regards,
Blair