[MERGE] Teach 'bzr remerge' to not use 'iter_conflicts'

Martin Pool mbp at canonical.com
Mon Oct 16 08:00:22 BST 2006

On 16 Oct 2006, John Arbash Meinel <john at arbash-meinel.com> wrote:
> The attached patch changes 'bzr remerge' to not use
> 'WorkingTree.iter_conflicts()'.
> iter_conflicts() is actually a slightly broken way of finding conflicts
> because it only looks at file suffixes (which means a file called
> foo.BASE will always be marked as conflicted).
> Which is why it was deprecated, in favor of using
> WorkingTree.conflicts(). Which for new versions just consults the
> conflict file.
> remerge required iter_conflicts() because it reset the conflict file
> before going on to the next step, which needed to know what files were
> actually conflicted.
> So the attached patch just gets the list of conflicted files before it
> resets it. All tests pass, so I believe it is the right fix.


(I just talked to John and Robert about deleting iter_conflicts
altogether, since we deprecated it in 0.8.  But removing it would only
delete a few lines and not particularly improve anything else, so it can


More information about the bazaar mailing list