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

[Martin Pool]

On 5/1/07, John Arbash Meinel <john at arbash-meinel.com> wrote:
>
> 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.

+1 for 0.16, very clearly.  bb didn't see this for some reason.

Maybe it'd be good to mention the bug id in the test code?

-- 
Martin