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

[Aaron Bentley]

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

John Arbash Meinel 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).

The other thing about iter_conflicts is that it reports only contents
conflicts, not other types.

> Which is why it was deprecated

I never supported that deprecation.

> 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.

Remerge only needs to know about contents conflicts, and it will
misbehave if it encounters other conflict types.

> 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.

- -1.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFFM33d0F+nu1YWqI0RAgGWAJ9KpZUJ1GCBJsJX46kFHth5daY0pACfWjSV
xgim2yf7jiXIEektS+4yPnU=
=QkHr
-----END PGP SIGNATURE-----