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

[John Arbash Meinel]

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

Aaron Bentley wrote:
> 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.

By the way, I'm going to require that we resolve this in one way or the
other for 0.12. So if you aren't happy with my proposed solution to
filter the conflict list, then I can revert the change, and we need to
undeprecate iter_conflicts().

I personally feel like iter_conflicts() is trying to read too much into
 filenames, but it is your code. So if you feel strongly that remerge
needs to use iter_conflicts(), then I can revert my changes, and
undeprecate iter_conflicts().

It would be nice to get a few more test cases to indicate *why* we need
to do this, so we don't break things in a future refactoring.

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

iD8DBQFFNCuyJdeBCYSNAAMRAu6iAJ9GQAWExdC3OTaBFrUiyyXAIbnBUwCgizCP
t9yvpiqotMDKmbfgAHwGDxk=
=Dq8E
-----END PGP SIGNATURE-----