Code review comment for lp:~jameinel/bzr/2.1.0b4-update-by-delta-bug

Revision history for this message
John A Meinel (jameinel) wrote :

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

Martin Pool wrote:
>> Which meant that on Windows the rename of 'a/b' => 'c/d' would show as a rename of 'a/b' => 'c/d'
>
> I don't understand the problem.

I probably wrote it a bit wrong.

A rename record in the dirstate ends up with 2 records. The location it
*was* at, and the location it is now at. A proper pair of records would
look like:

a b file-id r c/d OLD
c d file-id r NEW a/b

With this bug, we were getting:
                 v- wrong direction
a b file-id r c\d OLD
c d file-id r NEW a/b

Paths in dirstate are defined to be '/' separated, so using '\' is just
wrong.

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

iEYEARECAAYFAkr8DT4ACgkQJdeBCYSNAAMDIACeLpegL6wrSaN7fGRexs8W/IU1
dVwAn1wrGCvoizX8GXH7edp8+zMUD8yt
=MVxG
-----END PGP SIGNATURE-----

« Back to merge proposal