[PATCH] make file merging respect permissions
authorJames Bottomley <James.Bottomley@SteelEye.com>
Sun, 24 Apr 2005 03:50:10 +0000 (20:50 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 24 Apr 2005 03:50:10 +0000 (20:50 -0700)
commite2b6a9d0bf9335f24aa8b2be8ff00d3a4ccf6505
treee18acff3eeac6bee8a34b6c25016f1dfbdefbd67
parent58e28af6a4d4d4faa1fa628e91c0b33c2b87aade
[PATCH] make file merging respect permissions

1) permissions aren't respected in the merge script (primarily because
they're never passed in to it in the first place).  Fix that and also
check for permission conflicts in the merge

2) the delete of a file in both branches may indeed be just that, but it
could also be the indicator of a rename conflict (file moved to
different locations in both branches), so error out and ask the
committer for guidance.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
git-merge-one-file-script
merge-cache.c