Comment 3 for bug 67589
Revision history for this message
| Aaron Bentley (abentley) wrote Re: [Bug 67589] Re: 'bzr merge' conflict does not preserve permissions | #3 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
f33e652
(Get the code!)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
John A Meinel wrote:
> This is simply because bzr does not version anything but the executable
> bit. And in the short term, there is no plans to version more than that.
To expand a bit, new files are created with your umask, except for the
execute bit. When files are modified, whatever permissions they had on
disk are preserved.
The .gaim files you have after the merge are *new* files that bzr has no
reason to connect to the files that were previously under .gaim. The
.gaim.moved files are the files you previously had there.
It really has nothing to do with conflicts. Name the two directories
different things, and do a merge, and you'll get the same results.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iD8DBQFFO/
C6CFjuGXWMoegxx
=bAMn
-----END PGP SIGNATURE-----