[BUG] Wrong permissions after merge

[Jan Hudec]

Hello All,

Daniel Silverstone complained on IRC few minutes ago, that when there are
conflicts, the conflicted files are written with mode 600, instead of the
original mode.

Looking at ApplyMerge3, it's apply() method, it writes the data in a file
created by mkstemp and then either renames it over the original if the merge
is successful or invokes the merge handler if not. 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 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.

-- 
						 Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060210/9a96efcb/attachment.pgp