On Mon, 2008-03-31 at 20:43 +0200, Henrik Nordstrom wrote:
>
> But I have to ask Robert how we best continue the merge process on
> that
> branch.. I suspect it would actually be best to recreate the branch as
> a
> new bzr branch from trunk, if it's kept at all...
We can manually sync it up quite cleanly if we can determine the last
revision of trunk merged to it; after that merges would be smooth.
-Rob
-- GPG key available at: <http://www.robertcollins.net/keys.txt>.
This archive was generated by hypermail pre-2.1.9 : Tue Apr 01 2008 - 13:00:10 MDT