Re: bzr help, please

[Paul Eggert]

On 06/30/11 15:26, Lars Magne Ingebrigtsen wrote:
> I tried
> unbinding the bound branch I had, and now everything is very confused
> and I don't dare use that any more, and will pull down a new repository.
> 

Here's what I do.  I keep a bound branch named "trunk" that I regularly sync
to the trunk, and I never change it except either (1) by "bzr up",
or (2) by "bzr merge ../someotherbranch && bzr commit -m 'whatever'".
If step (2) fails in the middle, I do a "bzr revert && bzr up &&
(cd ../someotherbranch && bzr merge ../trunk && bzr commit -m 'Merge from 
trunk.')"
and then go back and redo step (2).  All my real work is done in
../someotherbranch.

I am leaving out all the intermediate steps where I get real work done
(e.g., resolving merge conflicts), but I hope you get the idea.