[MERGE][0.16][bug #111288] Don't increment filesystem iterator for unmatched entries

[John Arbash Meinel]

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

We had another small bug in _iter_changes which would cause a dirblock
of 'a' to match a filesystem of 'a2' and not emit an 'unknown' record
for 'a2'.

https://bugs.beta.launchpad.net/bzr/+bug/111288

It turns out that fixing this also simplified the code. Because it means
a missing disk-file is the same as a present disk-file and an 'absent'
dirblock record. We need to emit something for the dirblock record, but
we don't want to increment the disk pointer.

This is also a dirstate regression, which means it would be good to get
for 0.16. It is a shame I didn't see this when I was fixing the other bugs.

This will cause text conflicts with my bug #111127 fix, simply because
they are changing nearby code. They don't actually change the same
lines. I went ahead and merged them together in:

http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/dirstate_fixes

In case we want to just do a single submission for both.

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

iD8DBQFGNis1JdeBCYSNAAMRAiEyAKCy+V10P7Ob2ZH/KWQstjvC4SCDiQCdFoBD
faDNUhBV0E5vrctmoZ83jKg=
=i9ru
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: renamed_file_111288.patch
Type: text/x-patch
Size: 10776 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070430/2c7100f8/attachment.bin