dolfin team mailing list archive

[Johan Hake <johan.hake@xxxxxxxxx>]

On Tuesday November 1 2011 00:43:28 Martin Alnæs wrote:
> Den 1. nov. 2011 kl. 04:42 skrev Johan Hake <johan.hake@xxxxxxxxx>:
> > Hello!
> > 
> > What is the actuall differences between these two brances now. I have
> 
> Cd 1.0.x
> bzr missing ../trunk

Thanks!

Idealy one should then be able to do:

  cd trunk
  bzr merge < bzr missing ../1.0.x

:)

Johan

> 
> > 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.
> 
> Can you post the syntax you use for cherry-picking here for our education?
> 
> > I have not got used to the "new" development model yet...
> 
> There will be some pain at first, no doubt.
> 
> Martin
> 
> > Johan
> > 
> > _______________________________________________
> > Mailing list: https://launchpad.net/~dolfin
> > Post to     : dolfin@xxxxxxxxxxxxxxxxxxx
> > Unsubscribe : https://launchpad.net/~dolfin
> > More help   : https://help.launchpad.net/ListHelp
> 
> _______________________________________________
> Mailing list: https://launchpad.net/~dolfin
> Post to     : dolfin@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~dolfin
> More help   : https://help.launchpad.net/ListHelp