From: Yann Dirson <ydirson@altern.org>
Date: Fri, 2 Mar 2007 21:34:28 +0000 (+0000)
Subject: Add contrib/stg-swallow: completely merge an unapplied patch into current one
X-Git-Tag: v0.14.3~306
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/dee3cbb2feea6fa7f03d46070b2894fa8a957e3f?ds=sidebyside

Add contrib/stg-swallow: completely merge an unapplied patch into current one

Signed-off-by: Yann Dirson <ydirson@altern.org>
---

diff --git a/contrib/stg-swallow b/contrib/stg-swallow
new file mode 100755
index 0000000..5014f39
--- /dev/null
+++ b/contrib/stg-swallow
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+
+# stg-swallow - completely merge an unapplied patch into current one
+
+# Copyright (c) 2006-2007 Yann Dirson <ydirson@altern.org>
+# Subject to the GNU GPL, version 2.
+
+# FIXME:
+# - should provide support for conflict solving ?
+
+[ "$#" = 1 ] || { echo >&2 "Usage: $(basename $0) <patch>"; exit 1; }
+patch="$1"
+
+stg pick --fold "$patch"
+stg refresh
+stg push "$patch"
+#stg clean "$patch"
+stg pop; stg clean -u