--- a/tests/test-mv-cp-st-diff.out Mon Oct 19 22:19:28 2009 +0300
+++ b/tests/test-mv-cp-st-diff.out Fri Oct 16 23:57:34 2009 +0200
@@ -1,4 +1,4 @@
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
** rename in working dir **
@@ -120,7 +120,7 @@
+y1
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
** copy in working dir **
@@ -259,7 +259,7 @@
+y1
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
** single rename **
@@ -396,7 +396,7 @@
+y1
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
** single copy **
@@ -568,7 +568,7 @@
+y1
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
** rename chain **
@@ -694,7 +694,7 @@
+y1
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
** copy chain **
@@ -937,7 +937,7 @@
+y1
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
** circular rename **
@@ -1061,7 +1061,7 @@
+y1
-updating working directory
+updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
moving x/x to y/x