~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-swallow
diff --git
a/contrib/stg-swallow
b/contrib/stg-swallow
index
5014f39
..
924c079
100755
(executable)
--- a/
contrib/stg-swallow
+++ b/
contrib/stg-swallow
@@
-15,5
+15,9
@@
patch="$1"
stg pick --fold "$patch"
stg refresh
stg push "$patch"
stg pick --fold "$patch"
stg refresh
stg push "$patch"
+
#stg clean "$patch"
#stg clean "$patch"
-stg pop; stg clean -u
+#stg pop; stg clean -u
+[ $(stg id "$patch//top") != $(stg id "$patch//bottom") ] ||
+ { echo >&2 "Assertion failed: patch '$patch' is not empty after swallowing, not deleting it."; exit 1; }
+stg delete "$patch"