~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a bug in gitmergeonefile.py introduced recently
[stgit]
/
stgit
/
gitmergeonefile.py
diff --git
a/stgit/gitmergeonefile.py
b/stgit/gitmergeonefile.py
index
39915fb
..
b35880e
100644
(file)
--- a/
stgit/gitmergeonefile.py
+++ b/
stgit/gitmergeonefile.py
@@
-126,10
+126,10
@@
def merge(orig_hash, file1_hash, file2_hash,
return 1
# 3-way merge
else:
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)
if merge_ok:
os.system('git-update-index -- %s' % path)
@@
-142,7
+142,7
@@
def merge(orig_hash, file1_hash, file2_hash,
# reset the cache to the first branch
os.system('git-update-index --cacheinfo %s %s %s'
% (file1_mode, file1_hash, 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
__remove_files(orig_hash, file1_hash, file2_hash)
__conflict(path)
return 1