Mercurial > hg
changeset 18634:4b5d37ca3c11
tests: getremove test output changes (fold into previous patch)
| author | Bryan O'Sullivan <bryano@fb.com> |
|---|---|
| date | Sat, 09 Feb 2013 15:22:10 -0800 |
| parents | 6390dd22b12f |
| children | fed06dd07665 |
| files | tests/test-issue672.t tests/test-rename-dir-merge.t tests/test-rename-merge2.t tests/test-update-reverse.t |
| diffstat | 4 files changed, 0 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-issue672.t Sat Feb 09 15:22:09 2013 -0800 +++ b/tests/test-issue672.t Sat Feb 09 15:22:10 2013 -0800 @@ -37,7 +37,6 @@ 1: other deleted -> r 1a: remote created -> g removing 1 - updating: 1 1/2 files (50.00%) getting 1a updating: 1a 2/2 files (100.00%) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-rename-dir-merge.t Sat Feb 09 15:22:09 2013 -0800 +++ b/tests/test-rename-dir-merge.t Sat Feb 09 15:22:10 2013 -0800 @@ -45,11 +45,8 @@ b/a: remote created -> g b/b: remote created -> g removing a/a - updating: a/a 1/5 files (20.00%) removing a/b - updating: a/b 2/5 files (40.00%) getting b/a - updating: b/a 3/5 files (60.00%) getting b/b updating: b/b 4/5 files (80.00%) updating: a/c 5/5 files (100.00%)
--- a/tests/test-rename-merge2.t Sat Feb 09 15:22:09 2013 -0800 +++ b/tests/test-rename-merge2.t Sat Feb 09 15:22:10 2013 -0800 @@ -290,7 +290,6 @@ rev: versions differ -> m preserving rev for resolve of rev removing a - updating: a 1/3 files (33.33%) getting b updating: b 2/3 files (66.67%) updating: rev 3/3 files (100.00%)
--- a/tests/test-update-reverse.t Sat Feb 09 15:22:09 2013 -0800 +++ b/tests/test-update-reverse.t Sat Feb 09 15:22:10 2013 -0800 @@ -72,9 +72,7 @@ side2: other deleted -> r main: remote created -> g removing side1 - updating: side1 1/3 files (33.33%) removing side2 - updating: side2 2/3 files (66.67%) getting main updating: main 3/3 files (100.00%) 1 files updated, 0 files merged, 2 files removed, 0 files unresolved