How should this be used? Are you using a model such as the one suggested by Johan or do you use another model?
Another question I have is how to set up shortcuts/aliases for repositories (like one can do easily in hg). -- Anders On Thu, Feb 03, 2011 at 10:17:41PM +0000, Garth N. Wells wrote: > Something else is that 'rebasing' might be helpful before a merge, > > > http://doc.bazaar.canonical.com/latest/en/user-guide/adv_merging.html?highlight=rebase#rebasing > > Garth > > On 03/02/11 21:57, 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)? > >> > >> > >> _______________________________________________ > >> Mailing list: https://launchpad.net/~dolfin > >> Post to : [email protected] > >> Unsubscribe : https://launchpad.net/~dolfin > >> More help : https://help.launchpad.net/ListHelp > > > > _______________________________________________ > > Mailing list: https://launchpad.net/~dolfin > > Post to : [email protected] > > Unsubscribe : https://launchpad.net/~dolfin > > More help : https://help.launchpad.net/ListHelp > > _______________________________________________ > Mailing list: https://launchpad.net/~dolfin > Post to : [email protected] > Unsubscribe : https://launchpad.net/~dolfin > More help : https://help.launchpad.net/ListHelp _______________________________________________ Mailing list: https://launchpad.net/~dolfin Post to : [email protected] Unsubscribe : https://launchpad.net/~dolfin More help : https://help.launchpad.net/ListHelp
