[Svnmerge] Bi-directional merging becoming more painful

[Giovanni Bajo]

Blair Zajac <blair at orcaware.com> wrote:

>> 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".
>
> This goes to the two commit solution, if I read this correctly.
> Merge in the branch and than change the head.

You can change the head when you merge into it. Until that, there's no point in
doing it. If you merge A into B, you want avoid that commit to be merged into
A. But you can skip it "lazily" when merging into A, rather than marking it
when it happens.

Giovanni Bajo