Comment 6 for bug 344013

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 4/14/2011 10:00 AM, Alexander Belchenko wrote:
> This bug affects me as user of bzr-colo: while working with bzr colo I
> switch between feature branches all the time. Therefore I often get this
> problem with conflicted directory deletions because my editor of choice
> configured to left special config file in the current directory where
> I've invoked it. So after I've invoked my editor in newly created
> directory which exists only in one branch and then I switch to antoher
> branch in my colo workspace I get this conflict on switch. So I have to
> delete the directory manually and then `bzr resolve --all`. I'd happy if
> `bzr resolve` without options or arguments can do the right thing in my
> case.
>

Do you know about Vincent's change to conflict handling?

You can set:

 bzr.transform.orphan_policy = move

And it will move those temp files that have nowhere to go into
bzr-orphans instead of leaving the directory and marking it conflicted.

You can configure it based on location/branch.conf, or just set it
globally in bazaar.conf (AFAICT).

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk2m1SEACgkQJdeBCYSNAANR7QCeNCh4uH5leMASbwaZlHP2pi/6
pjkAn3t9tieSOFPc42hPEbimCp8llHox
=lj4z
-----END PGP SIGNATURE-----