diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 05:42:13 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 05:42:13 -0300 |
commit | 941ed87d34bcef83a8a1854d701aab846ba9e7a1 (patch) | |
tree | 2235544c419ffacdd13dbb7875a7aaf4911e822d /v4l/scripts/config.saa7134 | |
parent | 8e28cf165930d5a4f6c6cbdfae55d6dca28d554b (diff) | |
download | mediapointer-dvb-s2-941ed87d34bcef83a8a1854d701aab846ba9e7a1.tar.gz mediapointer-dvb-s2-941ed87d34bcef83a8a1854d701aab846ba9e7a1.tar.bz2 |
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>
Diffstat (limited to 'v4l/scripts/config.saa7134')
0 files changed, 0 insertions, 0 deletions