[Svnmerge] Bi-directional merging becoming more painful

[Giovanni Bajo]

Blair Zajac <blair at orcaware.com> wrote:

> I ended up looking through the log messages for the commits on my
> branch that actually were fresh commits and merged those into trunk.
>   Then I updated trunk's svnmerge-integrated property by hand to
> close out all outstanding merges that svnmerge could have done.

You could have used "svnmerge block" to this effect.

> So, given all that, where do we stand on resolving this issue in
> svnmerge.py?
> There was some discussion a while back, but I don't know where people
> stand now.


This discussion predates my involvement with svnmerge. I'll try to study the
issue better and come back to you.

My gut feeling is that, when doing bidirectional merges, we could automatically
mark head -> branch merges as blocked in head, so they don't get merged back.
To do this, you would probably need a way to gather the list of the
head->branch merges, which is exactly what we were discussing two weeks ago
("svnmerge log"). Assuming you can access that list, those merges could be
hidden in "svnmerge avail" and automatically blocked by "svnmerge merge".

OTOH, we didn't really reach a consensus on how to implement "svnmerge log".

Giovanni Bajo