[MERGE][bug #172657] Graph.find_differences() and status after merge

[John Arbash Meinel]

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

John Arbash Meinel wrote:
| Ian Clatworthy wrote:
| | John Arbash Meinel wrote:
| |> Attached is an updated form of my previous submission, which I now
| |> consider at least ready for review.
|
| Attached is the "final form" of the patch. With the updates to
| find_differences,
| and a new find_unique_ancestors function (which status uses). I believe
| I've
| addressed all of your concerns here. There is one test I'm still working
| on, to
| trigger a particular race condition I fixed. But the code itself should be
| correct, so I would rather submit it, and get it reviewed/merged rather
| than
| waiting on that to happen.
|


By the way, I *am* aware of a couple things like "pdb.set_trace()" still present
in the code. You can point them out if you want, but I'm already cleaning them up.

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

iEYEARECAAYFAkgaL3gACgkQJdeBCYSNAAM/DgCfY+VuqpEVKFdPYGaS+YAu9wLJ
1FYAn23v0mJ2uDaX6y9U0d6CwolFYHR5
=wIV3
-----END PGP SIGNATURE-----