[MERGE][0.16][bug #110256] Properly compare filesystem paths with absent and renamed entries

[John Arbash Meinel]

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

Simple summary....

When iterating over the filesystem and the dirstate entries in memory,
if the filesystem shows a path matching an 'absent' or 'renamed' entry,
it should be treated as a 'non-match'. And then filesystem pointer
should not be incremented. This way, when we have multiple entries for a
given path (renamed and added, or renamed and deleted, for example) one
of them will be ignored so the other one can match.

This fixes:
https://bugs.beta.launchpad.net/bzr/+bug/110256

And is a better fix for:
https://bugs.beta.launchpad.net/bzr/+bug/109993

This should also be merged for 0.16-final if possible.

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

iD8DBQFGMReQJdeBCYSNAAMRAlemAKCb305DKvghO4NW7LPyjSHA/a/PpACgiEA3
u417ZWhYkY/iSwbf5m7yfvQ=
=1Y+G
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: status_after_merge_110256.patch
Type: text/x-patch
Size: 13618 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070426/716a2378/attachment-0001.bin