diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-13 18:30:45 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-13 18:30:45 -0200 |
commit | a568e1259223dd4229419a5ea7fd44f757dbd265 (patch) | |
tree | d1f088a5863ca53e679954ed8b3605c5448b00a0 | |
parent | 20a16b5ff3c186e90241702dbbc00a25d0b1b9e2 (diff) | |
download | mediapointer-dvb-s2-a568e1259223dd4229419a5ea7fd44f757dbd265.tar.gz mediapointer-dvb-s2-a568e1259223dd4229419a5ea7fd44f757dbd265.tar.bz2 |
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>
-rwxr-xr-x | hgimport | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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" |