diff -r be43234a6d60 -r efdcce3fd2d5 tests/test-issue672.t
--- a/tests/test-issue672.t	Fri Dec 09 15:50:33 2011 +0100
+++ b/tests/test-issue672.t	Fri Dec 09 17:34:53 2011 +0100
@@ -32,8 +32,8 @@
      1a -> 1 
     checking for directory renames
   resolving manifests
-   overwrite None partial False
-   ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a
+   overwrite: False, partial: False
+   ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a
    1: other deleted -> r
    1a: remote created -> g
   updating: 1 1/2 files (50.00%)
@@ -63,8 +63,8 @@
      1a -> 1 *
     checking for directory renames
   resolving manifests
-   overwrite None partial False
-   ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96
+   overwrite: False, partial: False
+   ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96
    1a: local copied/moved to 1 -> m
   preserving 1a for resolve of 1a
   updating: 1a 1/1 files (100.00%)
@@ -86,8 +86,8 @@
      1a -> 1 *
     checking for directory renames
   resolving manifests
-   overwrite None partial False
-   ancestor c64f439569a9 local 746e9549ea96+ remote e327dca35ac8
+   overwrite: False, partial: False
+   ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8
    1: remote moved to 1a -> m
   preserving 1 for resolve of 1a
   removing 1