2011/11/1 Garth N. Wells <[email protected]>: > On 1 November 2011 10:24, Anders Logg <[email protected]> wrote: >> On Tue, Nov 01, 2011 at 10:14:33AM +0000, Garth N. Wells wrote: >>> On 1 November 2011 09:28, Anders Logg <[email protected]> wrote: >>> > On Tue, Nov 01, 2011 at 07:55:33AM +0000, Garth N. Wells wrote: >>> > >>> >> On 1 Nov 2011, at 03:42, Johan Hake <[email protected]> wrote: >>> >> >>> >> > Hello! >>> >> > >>> >> > What is the actuall differences between these two brances now. I have >>> >> > something I would like to get into lp:dolfin/1.0.x, but unfortunately >>> >> > I have >>> >> > synced my branch with lp:dolfin. >>> >> > >>> >> > Is there features that are in lp:dolfin which should not be dragged >>> >> > into >>> >> > lp:dolfin/1.0.x? In that case I wont merge my branch with >>> >> > lp:dolfin/1.0.x but >>> >> > rather try to cherry pick the revisions. >>> >> > >>> >> >>> >> Yes, there is now code in lp:dolfin that should not be merged into 1.0. >>> > >>> > As far as I understand, we should never merge trunk into 1.0.x but it >>> > should always (or at least for some time) be safe to merge 1.0.x into >>> > trunk. >>> > >>> > So bug fixes should always happen first in 1.0.x and then be merged >>> > into trunk. >>> > >>> > I know not everyone agrees with me on this (the append_revisions_only >>> > issue) >>> >>> I don't think that it's a case of agree or disagree. I think we all >>> agree on how we should attempt to work. Where we is disagree is that I >>> don't think that it's the end of the world if it doesn't always work >>> out. >> >> Fine. But I still don't see in which case this doesn't work out. Will >> it not always work to do >> >> cd ../trunk >> bzr merge ../foo >> > > The point is that if for some reason someone doesn't do the above, > it's nothing to lose sleep over. > >> ? >> >>> > but I think this will be much cleaner if the merge always >>> > happens *from* the branch that stuff should be merged into. >>> > >>> > cd ../trunk >>> > bzr merge ../1.0.x >>> > bzr commit >>> > # then bzr push lp:dolfin if trunk is not a bound branch >>> > >>> >>> This is how I've been working over the past few days. It would though >>> be nice to know how to pull individual change sets from one repository >>> into another. >> >> Martin claims this works but I don't know how. >> > > >From the man page: > > To merge changes up to and including revision 82 from bzr.dev > bzr merge -r 82 ../bzr.dev > > To merge the changes introduced by 82, without previous changes: > bzr merge -r 81..82 ../bzr.dev
And here is a short explanation: http://wiki.bazaar.canonical.com/CherryPick Benjamin > > Garth > > >> -- >> Anders >> > > _______________________________________________ > 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
