From: Petr Baudis <pasky@suse.cz>
Date: Thu, 25 Sep 2008 18:50:25 +0000 (+0200)
Subject: tg import: More graceful conflicts handling
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=5f3624dcccaa2397cc567ad3ddea0aba9087ca13;p=topgit.git

tg import: More graceful conflicts handling
---

diff --git a/tg-import.sh b/tg-import.sh
index 424f518..b036b86 100644
--- a/tg-import.sh
+++ b/tg-import.sh
@@ -72,9 +72,12 @@ process_commit()
 	info "---- Importing $commit to $branch_name"
 	tg create "$branch_name" $basedep
 	basedep=
-	git cherry-pick --no-commit "$commit"
 	get_commit_msg "$commit" > .topmsg
 	git add -f .topmsg .topdeps
+	if ! git cherry-pick --no-commit "$commit"; then
+		info "The commit will also finish the import of this patch."
+		exit 2
+	fi
 	git commit -C "$commit"
 	info "++++ Importing $commit finished"
 }