summaryrefslogtreecommitdiff
path: root/hgimport
AgeCommit message (Collapse)Author
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>
2009-02-13hgimport: only merge if pull returns without any errorMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-13displays a line syntax for tree mergeMauro Carvalho Chehab
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>
2008-12-18Fix an error and print a line that can be pastedMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-15merges from mainTobias Lorenz
2008-07-17Don't increment if a patch were renamedMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17Avoid running checkpatch.pl for merge patchesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-17Avoid multiple line comments to be messedMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-08Add capability for checking patches using kernel checkpatch.plMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-08-07Add a consistency check tool into hgimportMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Add a consistency tool into hgimport. This tool will follow the node IDs to determine if a patch series follows the same origin, or if there were some merge inside the patch series. This tool helps to check if something wrong might be happen into a patch series, or if troubles will be expected during the -git patchset generation procedures. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-07-27Add a script to allow cherry picking patches from another hg treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> This script allows cherry picking patches from other mercurial trees. It identifies the newer patches yet not applied at the current tree and download they to a temporary dir. The script works with other local trees, as well as with remote URLs. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>