# HG changeset patch # User Simon Law # Date 1239261754 14400 # Node ID 43f2315ce536e8be448120d53bf791315b990a01 # Parent 351ee65e69a98c3202aaa692fbaecebb6dc250a5 Update unit tests for Mercurial tip diff -r 351ee65e69a9 -r 43f2315ce536 test-forest --- a/test-forest Thu Apr 09 03:00:41 2009 -0400 +++ b/test-forest Thu Apr 09 03:22:34 2009 -0400 @@ -97,7 +97,7 @@ echo "# fseed" hg clone toplevel newtop -hg fseed -R newtop top-snap default +hg fseed top-snap default rm -rf newtop hg fseed --traceback --root newtop top-snap default >/dev/null hg fsnap --cwd newtop --compatible | fixpath diff -r 351ee65e69a9 -r 43f2315ce536 test-forest.out --- a/test-forest.out Thu Apr 09 03:00:41 2009 -0400 +++ b/test-forest.out Thu Apr 09 03:22:34 2009 -0400 @@ -37,18 +37,23 @@ # fclone [.] +updating working directory 3 files updated, 0 files merged, 0 files removed, 0 files unresolved [d/d/t] +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [e/d] +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved # fsnap @@ -234,6 +239,7 @@ summary: new line # fseed +updating working directory 4 files updated, 0 files merged, 0 files removed, 0 files unresolved [d/d/t] requesting all changes @@ -241,6 +247,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [e/d] @@ -249,6 +256,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] @@ -257,6 +265,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] @@ -265,6 +274,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [tree1] @@ -403,6 +413,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] @@ -411,6 +422,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved # foutgoing @@ -624,6 +636,7 @@ adding manifests adding file changes added 1 changesets with 3 changes to 3 files +updating working directory 3 files updated, 0 files merged, 0 files removed, 0 files unresolved [e/d] @@ -632,6 +645,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] @@ -640,6 +654,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] @@ -648,6 +663,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved . @@ -660,6 +676,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] @@ -668,6 +685,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] @@ -676,6 +694,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved . @@ -713,6 +732,7 @@ adding manifests adding file changes added 1 changesets with 3 changes to 3 files +updating working directory 3 files updated, 0 files merged, 0 files removed, 0 files unresolved [d/d/t] @@ -721,6 +741,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [e/d] @@ -729,6 +750,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] @@ -737,6 +759,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] @@ -745,6 +768,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved . @@ -797,12 +821,15 @@ # fclone + mq [.] +updating working directory 3 files updated, 0 files merged, 0 files removed, 0 files unresolved [d/d/t] +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [e/d] +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] @@ -812,6 +839,7 @@ skipped: 't/t' has mq patches applied [t/t/.hg/patches] +updating working directory 0 files updated, 0 files merged, 0 files removed, 0 files unresolved # fsnap + mq @@ -910,12 +938,15 @@ adding f adding f [.] +updating working directory 0 files updated, 0 files merged, 0 files removed, 0 files unresolved [a] +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [b] +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [.]