Added a script to run the tree merge procedure

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

hgimport was recommending a basic merge procedure. However, with some troubles:
- The procedure only works if the pulled tree creates a new head;
- The merge message should be manually written;
- No sanity checks were done before doing the merge;
- No error status were done.

The new perl script implements a better way to handle it, doing the necessary checks.

hgimport was updated to recommend the script usage.

Priority: normal

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/hgimport b/hgimport
index a8f46554d..4baf89e2b 100755
--- a/hgimport
+++ b/hgimport
@@ -104,5 +104,5 @@ 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 "To merge it, the better is to run the merge script:"
+echo "./v4l/scripts/do_merge.pl $1"