summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xhgimport4
1 files changed, 4 insertions, 0 deletions
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`"