~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update the tutorial for the conflict situations
[stgit]
/
contrib
/
stg-k
diff --git
a/contrib/stg-k
b/contrib/stg-k
index
0134c25
..
62211be
100755
(executable)
--- a/
contrib/stg-k
+++ b/
contrib/stg-k
@@
-8,11
+8,13
@@
set -e
# essence, "stg-k pop" is a "stg pop -k" that works better, hence its
# name.
# essence, "stg-k pop" is a "stg pop -k" that works better, hence its
# name.
-# CAVEAT: this script relies on the operation to run ignoring hidden
+# CAVEATS:
+# - this script relies on the operation to run ignoring hidden
# patches, so in 0.12 (where "stg push" can push an hidden patch)
# "stg-k push" will fail midway, albeit with no information loss -
# patches, so in 0.12 (where "stg push" can push an hidden patch)
# "stg-k push" will fail midway, albeit with no information loss -
-# you'll just have to finish manually. Luckilly this appears to work
-# on master branch.
+# you'll just have to finish manually. This is fixed in 0.13
+# - running this script to pop all patches in the stack fails, since
+# stg-unnew does not support this case.
# Copyright (c) 2007 Yann Dirson <ydirson@altern.org>
# Subject to the GNU GPL, version 2.
# Copyright (c) 2007 Yann Dirson <ydirson@altern.org>
# Subject to the GNU GPL, version 2.