[BUG] Wrong permissions after merge

[Aaron Bentley]

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

Jan Hudec wrote:
> ApplyMerge3 .. It however only copies
> permissions from the original file in the former case. And the merge handler
> does not copy permissions either. Could anybody confirm this analysis.

I think that's correct.  My bad.

> I have also noticed, that WeaveMerge uses AtomicFile instead and shouldn't
> have the problem. Perhaps AtomicFile could be used for the first case too if
> it was added a 'keep' method.

Yes, it probably could.  I'd favour the one-line bugfix, though, since
ApplyMerge3 is obsoleted by Tree Transform.  But whatever you prefer.

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

iD8DBQFD7Phc0F+nu1YWqI0RAjEFAJ4wQvD1OQMcb55Qw2rWbrLYJihJRgCeKYQv
MPfuhY15qPlEsRoKORCiD5E=
=JIYd
-----END PGP SIGNATURE-----