os.chmod(tmp, int(file2_mode, 8))
os.renames(tmp, src2)
+ if file1_hash and not os.path.exists(path):
+ # the current file might be removed by GIT when it is a new
+ # file added in both branches. Just re-generate it
+ tmp = __output('git-unpack-file %s' % file1_hash)
+ os.chmod(tmp, int(file1_mode, 8))
+ os.renames(tmp, path)
+
def __remove_files(orig_hash, file1_hash, file2_hash):
"""Remove any temporary files
"""
os.remove(src1)
if file2_hash:
os.remove(src2)
- pass
def __conflict(path):
"""Write the conflict file for the 'path' variable and exit
return 1
# 3-way merge
else:
- merge_ok = os.system(merger % {'branch1': src1,
- 'ancestor': orig,
- 'branch2': src2,
- 'output': path }) == 0
+ merge_ok = os.system(str(merger) % {'branch1': src1,
+ 'ancestor': orig,
+ 'branch2': src2,
+ 'output': path }) == 0
if merge_ok:
os.system('git-update-index -- %s' % path)
# reset the cache to the first branch
os.system('git-update-index --cacheinfo %s %s %s'
% (file1_mode, file1_hash, path))
- if keeporig != 'yes':
+ if str(keeporig) != 'yes':
__remove_files(orig_hash, file1_hash, file2_hash)
__conflict(path)
return 1