From 646f5e295e95d6295503fd5b3f5105102c8cc687 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 13 Feb 2009 18:29:23 -0200
Subject: displays a line syntax for tree merge

From: Mauro Carvalho Chehab <mchehab@redhat.com>

This is useful to do a cut-and-paste if all patches are ok

Priority: normal

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 hgimport | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'hgimport')

diff --git a/hgimport b/hgimport
index 099acbc52..ad73f2caf 100755
--- a/hgimport
+++ b/hgimport
@@ -104,3 +104,6 @@ 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"
+
-- 
cgit v1.2.3


From a568e1259223dd4229419a5ea7fd44f757dbd265 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 13 Feb 2009 18:30:45 -0200
Subject: hgimport: only merge if pull returns without any error

From: Mauro Carvalho Chehab <mchehab@redhat.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 hgimport | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'hgimport')

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