When manually resolving directory conflicts isn't a feature

[Eric Siegerman]

On Tue, 2009-04-07 at 08:33 +1000, Mary Gardiner wrote:
> (Re having separate projects for this entirely as Maritza Mendez,
> [...]

I think she was suggesting something quite different: not
separate projects, but simply giving each feature branch its own
working tree, and switching among them by just cd'ing into the
one you want to work on at the moment.  That sidesteps the whole
problem, by eliminating "bzr switch" from your workflow.

Of course there are reasons that might not work for you -- disk
space, or the need to have some things at fixed pathnames, or
just a strong distaste for all the cd'ing involved.

If you do have to stick with checkouts and "bzr switch", you can
make the problem rather less painful by "bzr resolve"ing the
conflicts *before* you delete the lingering junk (i.e. swap steps
5 and 6).  Resolving still won't be quite as simple as "bzr
resolve doc1", as "bzr resolve" isn't recursive; but that's easy
enough to work around with a little shell scripting, given that
the offending files will still exist at resolve time.

  - Eric