From 3051faceb5eb73f328a76d790a23fa7a9c71b427 Mon Sep 17 00:00:00 2001
From: Petr Baudis <pasky@suse.cz>
Date: Thu, 25 Sep 2008 20:11:38 +0200
Subject: [PATCH] tg import -d: Explicitly specify base dependency of the
 created branches

---
 README       | 3 ++-
 tg-import.sh | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 8129f91..35a9f98 100644
--- a/README
+++ b/README
@@ -417,7 +417,8 @@ tg import
 ~~~~~~~~~
 	Import commits within the given revision range into TopGit,
 	creating one topic branch per commit, the dependencies forming
-	a linear sequence starting on your current branch.
+	a linear sequence starting on your current branch (or a branch
+	specified by the '-d' parameter).
 
 	The branch names are auto-guessed from the commit messages
 	and prefixed by t/ by default; use '-p PREFIX' to specify
diff --git a/tg-import.sh b/tg-import.sh
index 6f8c8da..9f03c3f 100644
--- a/tg-import.sh
+++ b/tg-import.sh
@@ -7,6 +7,7 @@
 branch_prefix=t/
 single=
 ranges=
+basedep=
 
 
 ## Parse options
@@ -14,12 +15,14 @@ ranges=
 while [ -n "$1" ]; do
 	arg="$1"; shift
 	case "$arg" in
+	-d)
+		basedep="$1"; shift;;
 	-p)
 		branch_prefix="$1"; shift;;
 	-s)
 		single="$1"; shift;;
 	-*)
-		echo "Usage: tg [...] import {[-p PREFIX] RANGE...|-s NAME COMMIT}" >&2
+		echo "Usage: tg [...] import [-d BASE_BRANCH] {[-p PREFIX] RANGE...|-s NAME COMMIT}" >&2
 		exit 1;;
 	*)
 		ranges="$ranges $arg";;
@@ -63,7 +66,8 @@ process_commit()
 	commit="$1"
 	branch_name="$2"
 	info "---- Importing $commit to $branch_name"
-	tg create "$branch_name"
+	tg create "$branch_name" $basedep
+	basedep=
 	git cherry-pick --no-commit "$commit"
 	get_commit_msg "$commit" > .topmsg
 	git add -f .topmsg .topdeps
-- 
2.30.2