mediapointer-dvb-s2/hgimport, branch master

Added a script to run the tree merge procedure

2009-03-29T08:42:13+00:00

From: Mauro Carvalho Chehab 

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

hgimport: only merge if pull returns without any error

2009-02-13T20:30:45+00:00

From: Mauro Carvalho Chehab 

Signed-off-by: Mauro Carvalho Chehab

displays a line syntax for tree merge

2009-02-13T20:29:23+00:00

From: Mauro Carvalho Chehab 

This is useful to do a cut-and-paste if all patches are ok

Priority: normal

Signed-off-by: Mauro Carvalho Chehab

Fix an error and print a line that can be pasted

2008-12-18T15:05:51+00:00

From: Mauro Carvalho Chehab 

Priority: normal

Signed-off-by: Mauro Carvalho Chehab

merges from main

2008-10-15T17:06:40+00:00

Don't increment if a patch were renamed

2008-07-17T13:58:44+00:00

From: Mauro Carvalho Chehab 

Signed-off-by: Mauro Carvalho Chehab

Avoid running checkpatch.pl for merge patches

2008-07-17T13:34:11+00:00

From: Mauro Carvalho Chehab 

Signed-off-by: Mauro Carvalho Chehab

Avoid multiple line comments to be messed

2007-10-17T16:12:43+00:00

From: Mauro Carvalho Chehab 



Signed-off-by: Mauro Carvalho Chehab

Add capability for checking patches using kernel checkpatch.pl

2007-10-08T22:58:39+00:00

From: Mauro Carvalho Chehab 



Signed-off-by: Mauro Carvalho Chehab

Add a consistency check tool into hgimport

2007-08-07T13:52:55+00:00

From: Mauro Carvalho Chehab 

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