From a568e1259223dd4229419a5ea7fd44f757dbd265 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 13 Feb 2009 18:30:45 -0200 Subject: hgimport: only merge if pull returns without any error From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- hgimport | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hgimport b/hgimport index ad73f2caf..a8f46554d 100755 --- a/hgimport +++ b/hgimport @@ -105,5 +105,4 @@ done echo To cherry pick all files, you can do something like: echo "for i in $TMP/*.patch; do ./mailimport \$i; done" echo "To merge it, the better is to do:" -echo "hg pull $1; hg merge && hg commit && make && hg push" - +echo "hg pull $1 && hg merge && hg commit && make && hg push" -- cgit v1.2.3