Re: Implicit keep-alive after reintegrate merge

[Stefan Sperling]

On Mon, Jan 30, 2012 at 02:23:46PM +0100, Stefan Sperling wrote:
>      (3)
>                 +-b@r2--+ b@r3--b@r4-b@r5 ----
>       (branch) /        ^             | (merge 2)
>               /         | (merge 1)   v
>         --- a@r1 ------a@r2-----------+- a@r6 ----
> 
> Merge 1 brings a@r2 into b@r2.
> Merge 2 brings b@r4 into a@r5.

Hmpf. I tweaked this before hitting 'send' and some of the numbers
are off. You get the idea:

      (3)
                 +-b@r2--+ b@r4--b@r5-b@r6 ----
       (branch) /        ^             | (merge 2)
               /         | (merge 1)   v
         --- a@r1 ------a@r3-----------+- a@r7 ----