[MERGE] Fix case-sensitivity detection

Aaron Bentley aaron.bentley at utoronto.ca
Wed Nov 28 15:05:40 GMT 2007


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

John Arbash Meinel wrote:
> Aaron Bentley wrote:
> You seem to be testing that if TT sees 2 forms of a file then it will notice
> that they have a case conflict (which is very good). But what about if the
> filesystem already has one form, and TT is seeing another.

That's implicitly handled because of the way conflict resolution is done.

But explicit is better than implicit, so I've added a test:
test_conflict_on_case_insensitive_existing

> Is that already handled in TT because it is stat'ing the target and will see
> that it already exists? I'm guessing there isn't any way to test this on
> case-sensitive platforms.

It's handled because:

1. We call TreeTransform._add_tree_children(), which ensures that TT is
aware of all paths that could conflict.

2. When detecting conflicts, we handle all paths uniformly, whether they
are paths in the working tree or paths added by the transform.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHTYPE0F+nu1YWqI0RAok7AKCA6hINgeVI0ZBGvdSc+fgGcimeuQCdHKvV
zgQyIPB9CZcboqpol/Zip1c=
=xq52
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: case-sensitive-3.patch
Type: text/x-patch
Size: 17186 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071128/eab30396/attachment.bin 


More information about the bazaar mailing list