Test mercurial convert sink removes empty directories.

tests/test-convert-git

@@ -1,46 +1,56
 #!/bin/sh
 
 "$TESTDIR/hghave" git || exit 80
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert=" >> $HGRCPATH
 
 GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
 GIT_AUTHOR_EMAIL='[e-mail]'; export GIT_AUTHOR_EMAIL
 GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE
 GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME
 GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL
 GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE
 
 count=10
 commit()
 {
     GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000"
     GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
     git commit "$@" >/dev/null 2>/dev/null || echo "git commit error"
     count=`expr $count + 1`
 }
 
 mkdir git-repo
 cd git-repo
 git init-db >/dev/null 2>/dev/null
 echo a > a
-git add a
-commit -m t1
+mkdir d
+echo b > d/b
+git add a d
+commit -a -m t1
+
+# Remove the directory, then try to replace it with a file
+# (issue 754)
+git rm -r d
+commit -m t2
+echo d > d
+git add d
+commit -m t3
 
 echo b >> a
-commit -a -m t2.1
+commit -a -m t4.1
 
 git checkout -b other HEAD^ >/dev/null 2>/dev/null
 echo c > a
 echo a >> a
-commit -a -m t2.2
+commit -a -m t4.2
 
 git checkout master >/dev/null 2>/dev/null
 git pull --no-commit . other > /dev/null 2>/dev/null
 commit -m 'Merge branch other'
 cd ..
 
 hg convert --datesort git-repo
 
 hg -R git-repo-hg tip -v

tests/test-convert-git.out

@@ -1,22 +1,25
+rm 'd/b'
 assuming destination git-repo-hg
 initializing destination git-repo-hg repository
 scanning source...
 sorting...
 converting...
-3 t1
-2 t2.1
-1 t2.2
+5 t1
+4 t2
+3 t3
+2 t4.1
+1 t4.2
 0 Merge branch other
-changeset:   3:f0873470732d
+changeset:   5:77dc8b329132
 tag:         tip
-parent:      1:cb991dbbb06b
-parent:      2:600bef931ca4
+parent:      3:6f360826ff29
+parent:      4:b5fadecd5d0e
 user:        test <[e-mail]>
-date:        Mon Jan 01 00:00:13 2007 +0000
+date:        Mon Jan 01 00:00:15 2007 +0000
 files:       a
 description:
 Merge branch other
 
 committer: test <[e-mail]>