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

John Arbash Meinel john at arbash-meinel.com
Mon Oct 16 07:39:05 BST 2006


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

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.

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

iD8DBQFFMyjBJdeBCYSNAAMRAoxZAKCso8fNkKbZ5QDsa7u2cvh3gLvAhACggfKd
g4/uo6hhUdiukhgJpEqjcNg=
=nREF
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: remerge_without_iter.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20061016/8c70fa1c/attachment.diff 


More information about the bazaar mailing list