Re: Implicit keep-alive after reintegrate merge

On Mon, Jan 30, 2012 at 02:23:46PM +0100, Stefan Sperling wrote:
> (3)
> +-b_at_r2--+ b_at_r3--b@r4-b_at_r5 ----
> (branch) / ^ | (merge 2)
> / | (merge 1) v
> --- a_at_r1 ------a_at_r2-----------+- a_at_r6 ----
>
> Merge 1 brings a_at_r2 into b_at_r2.
> Merge 2 brings b_at_r4 into a_at_r5.

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

      (3)
                 +-b_at_r2--+ b_at_r4--b@r5-b_at_r6 ----
       (branch) / ^ | (merge 2)
               / | (merge 1) v
         --- a_at_r1 ------a_at_r3-----------+- a_at_r7 ----
Received on 2012-01-30 14:28:46 CET