# HG changeset patch # User Patrick Mezard # Date 1290119795 -3600 # Node ID 5f20f2b657fd1b1d0cd8c32277ee24c8aa49c096 # Parent 95bb037074138e9836c297e9657dc40bf09ef82f Update test output to 1.7 diff -r 95bb03707413 -r 5f20f2b657fd test-forest.out --- a/test-forest.out Thu Nov 18 23:28:03 2010 +0100 +++ b/test-forest.out Thu Nov 18 23:36:35 2010 +0100 @@ -37,23 +37,23 @@ # fclone [.] -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved [d/d/t] -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [e/d] -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved # fsnap @@ -239,42 +239,38 @@ summary: new line # fseed -updating working directory +updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved [d/d/t] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [e/d] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [tree1] @@ -413,7 +409,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] @@ -422,7 +418,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved # foutgoing @@ -631,39 +627,35 @@ # fseed and fpull, missing section [.] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved [e/d] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved . @@ -671,30 +663,27 @@ t t/t [e/d] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved . @@ -703,7 +692,6 @@ t/t [.] pulling from HGTMP/test-forest/toplevel -requesting all changes adding changesets adding manifests adding file changes @@ -727,48 +715,43 @@ # fseed and fpull, named section [.] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved [d/d/t] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [e/d] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] -requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved . @@ -821,15 +804,15 @@ # fclone + mq [.] -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved [d/d/t] -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [e/d] -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] @@ -839,7 +822,7 @@ skipped: 't/t' has mq patches applied [t/t/.hg/patches] -updating working directory +updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved # fsnap + mq @@ -938,15 +921,15 @@ adding f adding f [.] -updating working directory +updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved [a] -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [b] -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [.]