--- a/tests/test-convert-baz.out	Sun Jan 04 21:32:40 2009 +0100
+++ b/tests/test-convert-baz.out	Mon Jan 05 14:34:20 2009 +0100
@@ -44,19 +44,36 @@
 => src/.arch-ids/b.id	test/.arch-ids/b.id
 * update pristine tree (baz@mercurial--convert/baz--test--0--patch-4 => baz--test--0--patch-5)
 * committed baz@mercurial--convert/baz--test--0--patch-5
+% move and add the moved file again
+A  .arch-ids/e.id
+A  e
+* update pristine tree (baz@mercurial--convert/baz--test--0--patch-5 => baz--test--0--patch-6)
+* committed baz@mercurial--convert/baz--test--0--patch-6
+A  .arch-ids/e.id
+A  e
+=> .arch-ids/e.id	.arch-ids/f.id
+=> e	f
+* update pristine tree (baz@mercurial--convert/baz--test--0--patch-6 => baz--test--0--patch-7)
+* committed baz@mercurial--convert/baz--test--0--patch-7
 % converting baz repo to Mercurial
 initializing destination baz-repo-hg repository
 analyzing tree version baz@mercurial--convert/baz--test--0...
 scanning source...
 sorting...
 converting...
-5 initial import
-4 added a file, src and src/b (binary)
-3 added link to a and modify a
-2 added second link and modify b
-1 file to link and link to file test
-0 move and rename a-link-2 file and src directory
+7 initial import
+6 added a file, src and src/b (binary)
+5 added link to a and modify a
+4 added second link and modify b
+3 file to link and link to file test
+2 move and rename a-link-2 file and src directory
+1 add e
+0 move e and recreate it again
 % show graph log
+o  7 "move e and recreate it again" files: e f
+|
+o  6 "add e" files: e
+|
 o  5 "move and rename a-link-2 file and src directory" files: c src/a-link src/a-link-2 src/b test/a-link test/b
 |
 o  4 "file to link and link to file test" files: src/a-link-2 src/b
@@ -70,6 +87,10 @@
 o  0 "initial import" files:
 
 c4072c4b72e1cabace081888efa148ee80ca3cbb 644   a
-e3207be798aaf87a444a62903621edab4ddc1fb6 644   c
-1f6b5bb93f1da278ef1fead1e4740a03d8802e9f 644 @ test/a-link
-1f6b5bb93f1da278ef1fead1e4740a03d8802e9f 644 @ test/b
+623942606de842342ac7b221ae9ccabc13b5d8c8 644   c
+1a4a864db0073705a11b1439f563bfa4b46d9246 644   e
+ab9089704d7c988687521e6adf018ebf767da7d6 644   f
+43b4308708a4b36340566684df2e2a074b12ceb0 644 @ test/a-link
+73773e3389ef7ec5a070519b74895d2eaa4ad5db 644 @ test/b
+copies:      c (src/a-link-2) test/a-link (src/a-link) test/b (src/b)
+copies:      f (e)