status and commit uses different algorithms to find changes

[John Arbash Meinel]

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

> 
> I think something wrong here in either case. Because I don't understand how it possible
> to see *right* output from status and diff after merge, while they're using iter_changes
> and in the same time claim that iter_changes wrong for collecting changes for commit
> pending merges.
> 
> I'm totally lost here.


iter_changes gives the correct results when comparing 2 trees.

commit after a merge has to record information about 3 trees. base
parent, merged parent, and current tree.

As I said before we *could* use iter_changes as it is right now in the
case of a single parent (no merges).

"bzr status" after a merge only shows the changes versus the base
parent, which is generally what you want anyway. But for *commit* you
need to be aware of what was in the base parent, what was brought in
from the merge parent, what is new between both sides.

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

iEYEARECAAYFAkjs+h4ACgkQJdeBCYSNAAPTBwCdFzIDh5//Urc0puwQWqUJWWF8
nCgAoNIGSSRqV4MeUeBw6YmyRbGz5Piz
=BNtz
-----END PGP SIGNATURE-----