Comment 1 for bug 90569
Revision history for this message
| Aaron Bentley (abentley) wrote Re: [Bug 90569] Bazaar should cleanly handle added files that are identical to existing unversioned files | #1 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
0e1f616
(Get the code!)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Mark Shuttleworth wrote:
> the backstory is that I needed to add that symlink to make things work on Feisty so I did, but left it unversioned then someone added an identical symlink to the tree when i merged, i got a conflict. i would understand that if the unversioned symlink I added was different to the new, versioned one, but in fact they are identical.
> imo this should "Just Work" - bzr should see the added symlink is identical to the unversioned one there, and "merge cleanly"
This is certainly possible in principle. It probably requires a new way
to get the SHA1 or symlink target of mechanize, i.e.
TreeTransorm.
We should also consider whether reverting in your scenario should delete
the symlink, and, if not, how to prevent it.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iD8DBQFF8Bti0F+
qiWRQ4xEMUFtPkJ
=dcCx
-----END PGP SIGNATURE-----