The merge method was changed from gitmergeonefile.merge() to the external
git-merge-recursive which handles renames properly. The 'mv' command was
added as well.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
local tree
"""
refresh_index()
- if __run('git-read-tree -u -m --aggressive', [base, head1, head2]) != 0:
- raise GitException, 'git-read-tree failed (local changes maybe?)'
+
+ try:
+ # use _output() to mask the verbose prints of the tool
+ _output('git-merge-recursive %s -- %s %s' % (base, head1, head2))
+ except GitException:
+ pass
# check the index for unmerged entries
files = {}