Bazaar

  1. Bug #344013
  2. Comment #7

Comment 7 for bug 344013

Revision history for this message
Alexander Belchenko (bialix) wrote : Re: [Bug 344013] Re: bzr resolve should automatically resolve conflicted directory deletion

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?