summaryrefslogtreecommitdiff
path: root/hgimport
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-02-13 18:29:23 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-02-13 18:29:23 -0200
commit646f5e295e95d6295503fd5b3f5105102c8cc687 (patch)
treedc6d8bcd4583f4964b3995d9ed6f518b8de606fd /hgimport
parenta276bad648b7122321a2295550c71a9ce2f65628 (diff)
downloadmediapointer-dvb-s2-646f5e295e95d6295503fd5b3f5105102c8cc687.tar.gz
mediapointer-dvb-s2-646f5e295e95d6295503fd5b3f5105102c8cc687.tar.bz2
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>
Diffstat (limited to 'hgimport')
-rwxr-xr-xhgimport3
1 files changed, 3 insertions, 0 deletions
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"
+