merge: http://linuxtv.org/hg/~jfrancois/gspca/

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 7 insertions, 0 deletions

diff --git a/hgimport b/hgimport
index 861c89b55..d12c84f81 100755
--- a/hgimport
+++ b/hgimport
@@ -61,9 +61,16 @@ 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
+
+			# Avoids incrementing if rename happens
+			j=$((j-1))
 		fi
 	else
 		last="`hg log -r -1|grep changeset`"