[PATCH 05 of 11] tests: getremove test output changes (fold into previous patch)
Bryan O'Sullivan
bos at serpentine.com
Sat Feb 9 08:06:45 CST 2013
# HG changeset patch
# User Bryan O'Sullivan <bryano at fb.com>
# Date 1360418465 0
# Node ID 849757bef45281eefa0e7425865b00ddf4159f5d
# Parent 0f7228360de75e966742d29662ff6984077806ff
tests: getremove test output changes (fold into previous patch)
diff --git a/tests/test-issue672.t b/tests/test-issue672.t
--- a/tests/test-issue672.t
+++ b/tests/test-issue672.t
@@ -37,7 +37,6 @@ http://mercurial.selenic.com/bts/issue67
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
diff --git a/tests/test-rename-dir-merge.t b/tests/test-rename-dir-merge.t
--- a/tests/test-rename-dir-merge.t
+++ b/tests/test-rename-dir-merge.t
@@ -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%)
diff --git a/tests/test-rename-merge2.t b/tests/test-rename-merge2.t
--- a/tests/test-rename-merge2.t
+++ b/tests/test-rename-merge2.t
@@ -290,7 +290,6 @@ args:
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%)
diff --git a/tests/test-update-reverse.t b/tests/test-update-reverse.t
--- a/tests/test-update-reverse.t
+++ b/tests/test-update-reverse.t
@@ -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
More information about the Mercurial-devel
mailing list