~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Failed recursive merging can silently lose date in StGIT
[stgit]
/
stgit
/
stack.py
diff --git
a/stgit/stack.py
b/stgit/stack.py
index
0f5d868
..
b21cc30
100644
(file)
--- a/
stgit/stack.py
+++ b/
stgit/stack.py
@@
-1030,7
+1030,8
@@
class Series(StgitObject):
except git.GitException, ex:
print >> sys.stderr, \
'The merge failed during "push". ' \
except git.GitException, ex:
print >> sys.stderr, \
'The merge failed during "push". ' \
- 'Use "refresh" after fixing the conflicts'
+ 'Use "refresh" after fixing the conflicts or ' \
+ 'revert the operation with "push --undo".'
append_string(self.__applied_file, name)
append_string(self.__applied_file, name)