Comment 2 for bug 67589

Revision history for this message
Daniel Werner (demitsu) wrote : Re: 'bzr merge' conflict does not preserve permissions

> bzr does not version anything but the executable bit

Thanks for pointing this out to me. Next time I'm going to RTFM first, though. It's in the FAQ... <hides/>

> So for now, bzr is focused on versioning source code.

That's a pity, but I guess file permissions are an implementation detail of the underlying file system anyway, and bzr cannot reasonably be concerned about permission metadata in a portable way (Win32, SE Linux, RSBAC...).

In retrospect, it seems like bad idea to include my keys in that branch anyway. Now I'll just have to find a way to "unpull" that merge without completely starting the branch over...