[MERGE][bug 115947] Fix DirState.set_state_from_inventory() for paths with common prefixes

[John Arbash Meinel]

It seems that DirState.set_state_from_inventory has a bug when handling 
paths with common prefixes. (like a/b and a-b/).

It only happens when you have an inventory which modifies a record in 
the shorter name, which will cause a mismatch when looking at the longer 
one.

Attached is a bundle with a test case and a fix for it.

The bug has another possible fix, but this one seemed cleaner and easier 
overall.

Also, if/when we bring in my DirState pyrex code, we can use 
"cmp_paths_by_dir()" which does the same thing without having to split('/').

John
=:->
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: dirstate_set_state_from_inv_115947.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20070521/9e5a766a/attachment.diff