dolfin team mailing list archive

[Johan Hake <johan.hake@xxxxxxxxx>]

On Thursday February 3 2011 14:45:55 Anders Logg wrote:
> Looking at this again, how is it different from just removing the
> middle repository (~/dolfin-test) and communicating via B and C
> directly from ~/dolfin-logg?

That was actually my initial thought. 

But you might have done some changes to ~/dolfin-logg after you have pushed it 
to lp:dolfin-logg for testing. Making it more difficult to push to lp:dolfin-
main. But I guess you should be able to just cherrypick the revisions (the one 
you have tested in lp:dolfin-logg) you push to lp:dolfin-main.

Johan
 
> --
> Anders
> 
> On Thu, Feb 03, 2011 at 01:57:03PM -0800, Johan Hake wrote:
> > What with:
> >                              lp:dolfin-logg
> >                              
> >                                   .
> >                                  
> >                                  /|\
> >                                  
> >                                  (B)
> >                                  
> >                                  \|/
> >                                  
> >                                   .
> >   
> >   ~/dolfin-logg <-(A)->  ~/dolfin-test <-(C)-> lp:dolfin-main
> > 
> > Johan
> > 
> > On Thursday February 3 2011 13:21:11 Anders Logg wrote:
> > > 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)?