From a125274f2dd3073a55dc7c59434dd60d4438bfef Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 17 Jul 2008 10:34:11 -0300 Subject: Avoid running checkpatch.pl for merge patches From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- hgimport | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'hgimport') diff --git a/hgimport b/hgimport index 861c89b55..a424587dc 100755 --- a/hgimport +++ b/hgimport @@ -61,9 +61,13 @@ for i in $CS; do if [ "$parents" == "$old_id" ]; then echo "Ok." else + newname="$TMP/hg_${TREE}_$(printf %0${#NUM}d ${j}).merge" + echo "Nok/Merge:" echo -e "\t\tOld node ID: $old_id" echo -e "\t\tNode parents $parents" + echo -e "\t\tRenamed to $newname" + mv $name $newname fi else last="`hg log -r -1|grep changeset`" -- cgit v1.2.3 From 3fe2344caf39a540e5315763e4a5ca0183afbd51 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 17 Jul 2008 10:58:44 -0300 Subject: Don't increment if a patch were renamed From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- hgimport | 3 +++ 1 file changed, 3 insertions(+) (limited to 'hgimport') diff --git a/hgimport b/hgimport index a424587dc..d12c84f81 100755 --- a/hgimport +++ b/hgimport @@ -68,6 +68,9 @@ for i in $CS; do echo -e "\t\tNode parents $parents" echo -e "\t\tRenamed to $newname" mv $name $newname + + # Avoids incrementing if rename happens + j=$((j-1)) fi else last="`hg log -r -1|grep changeset`" -- cgit v1.2.3