dolfin team mailing list archive

[Anders Logg <logg@xxxxxxxxx>]

I'm trying to figure out what model I should use for merge/pull/push
now that we have separate repos on Launchpad:

    lp:dolfin-logg  <---(A)--->  lp:dolfin-main
        .                   /          .
       /|\                 /          /|\
        |                 /            |
       (C)              (E)           (D)
        |               /              |
       \|/             /              \|/
        .             /                .
    ~/dolfin-logg   <---(B)--->  ~/dolfin-main

I tried this:

1. Update lp logg:

   push up (C)

2. Update local main:

   pull down (D)

3. Merge local main:

   merge right (B) + commit

4. Update lp main:

   push up (D)

5. Update local logg:

   pull down (E)

But then I got into all sorts of trouble with warnings from bzr about
criss-cross merging.

Any thoughts?

Is here a way to merge via (A)?

--
Anders