projects
/
mdk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a94d9c3
)
Trivial fix of error display
author
Frederic Massart
<fred@moodle.com>
Thu, 28 Feb 2013 05:50:06 +0000
(13:50 +0800)
committer
Fred
<fmcell@gmail.com>
Fri, 1 Mar 2013 11:31:33 +0000
(19:31 +0800)
moodle-backport.py
patch
|
blob
|
history
diff --git
a/moodle-backport.py
b/moodle-backport.py
index
bb9a240
..
840f43f
100755
(executable)
--- a/
moodle-backport.py
+++ b/
moodle-backport.py
@@
-135,13
+135,13
@@
for v in versions:
if result[0] != 0:
debug('Error while cherry-picking %s in %s.' % (cherry, name))
debug(result[2])
- debug('')
if yesOrNo('The cherry-pick might still be in progress, would you like to abort it?'):
result = M2.git().pick(abort=True)
if result[0] > 0 and result[0] != 128:
debug('Could not abort the cherry-pick!')
else:
stashPop(stash)
+ debug('')
continue
# Pushing branch