summaryrefslogtreecommitdiff
path: root/v4l/scripts/do_merge.pl
AgeCommit message (Collapse)Author
2009-03-29do_merge.pl: Do a small fix at the building part of the scriptMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-29Added a script to run the tree merge procedureMauro Carvalho Chehab
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>