diff options
-rwxr-xr-x | hgimport | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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`" |