Bazaar

  1. Bug #344013
  2. Comment #8

Comment 8 for bug 344013

Revision history for this message
John A Meinel (jameinel) wrote : Re: [Bug 344013] Re: bzr resolve should automatically resolve conflicted directory deletion

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

On 4/14/2011 1:13 PM, Alexander Belchenko wrote:
> John Arbash Meinel пишет:
>> 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).
>>
>
> No, I wasn't aware of this improvements. Does it work with bzr 2.3?

release-notes says it was introduced in bzr-2.3b2. So it should be in
all the 2.3 finals.

John
=:->

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

iEYEARECAAYFAk2m1zEACgkQJdeBCYSNAAOE6QCgxCm0MMWF9Lfq91xh53IJVffW
d2wAoLg9sCEupo3UsGcuEHsd0E/HmlUd
=YCRv
-----END PGP SIGNATURE-----