--- a/tests/test-graft.t Sat Feb 09 15:21:58 2013 -0800
+++ b/tests/test-graft.t Sat Feb 09 15:22:04 2013 -0800
@@ -150,8 +150,8 @@
branchmerge: True, force: True, partial: False
ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
e: remote is newer -> g
+ getting e
updating: e 1/1 files (100.00%)
- getting e
e
grafting revision 4
searching for copies back to rev 1
@@ -161,8 +161,8 @@
d: remote is newer -> g
e: versions differ -> m
preserving e for resolve of e
+ getting d
updating: d 1/2 files (50.00%)
- getting d
updating: e 2/2 files (100.00%)
picked tool 'internal:merge' for e (binary False symlink False)
merging e
--- a/tests/test-issue522.t Sat Feb 09 15:21:58 2013 -0800
+++ b/tests/test-issue522.t Sat Feb 09 15:22:04 2013 -0800
@@ -32,8 +32,8 @@
branchmerge: True, force: False, partial: False
ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee
foo: remote is newer -> g
+ getting foo
updating: foo 1/1 files (100.00%)
- getting foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--- a/tests/test-issue672.t Sat Feb 09 15:21:58 2013 -0800
+++ b/tests/test-issue672.t Sat Feb 09 15:22:04 2013 -0800
@@ -36,10 +36,10 @@
ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a
1: other deleted -> r
1a: remote created -> g
+ removing 1
updating: 1 1/2 files (50.00%)
- removing 1
+ getting 1a
updating: 1a 2/2 files (100.00%)
- getting 1a
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--- a/tests/test-largefiles.t Sat Feb 09 15:21:58 2013 -0800
+++ b/tests/test-largefiles.t Sat Feb 09 15:22:04 2013 -0800
@@ -1679,8 +1679,8 @@
branchmerge: False, force: False, partial: False
ancestor: 000000000000, local: 000000000000+, remote: cf03e5bb9936
.hglf/f1: remote created -> g
+ getting .hglf/f1
updating: .hglf/f1 1/1 files (100.00%)
- getting .hglf/f1
getting changed largefiles
using http://localhost:$HGPORT2/
sending capabilities command
--- a/tests/test-rename-dir-merge.t Sat Feb 09 15:21:58 2013 -0800
+++ b/tests/test-rename-dir-merge.t Sat Feb 09 15:22:04 2013 -0800
@@ -44,16 +44,16 @@
a/c: remote renamed directory to b/c -> d
b/a: remote created -> g
b/b: remote created -> g
+ removing a/a
updating: a/a 1/5 files (20.00%)
- removing a/a
- updating: a/b 2/5 files (40.00%)
removing a/b
- updating: a/c 3/5 files (60.00%)
+ 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%)
moving a/c to b/c
- updating: b/a 4/5 files (80.00%)
- getting b/a
- updating: b/b 5/5 files (100.00%)
- getting b/b
3 files updated, 0 files merged, 2 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--- a/tests/test-rename-merge1.t Sat Feb 09 15:21:58 2013 -0800
+++ b/tests/test-rename-merge1.t Sat Feb 09 15:22:04 2013 -0800
@@ -41,17 +41,17 @@
a2: divergent renames -> dr
b2: remote created -> g
removing a
- updating: a 1/3 files (33.33%)
+ getting b2
+ updating: b2 1/3 files (33.33%)
+ updating: a 2/3 files (66.67%)
picked tool 'internal:merge' for b (binary False symlink False)
merging a and b to b
my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
premerge successful
- updating: a2 2/3 files (66.67%)
+ updating: a2 3/3 files (100.00%)
note: possible conflict - a2 was renamed multiple times to:
c2
b2
- updating: b2 3/3 files (100.00%)
- getting b2
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -183,11 +183,11 @@
ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0
file: rename and delete -> rd
newfile: remote created -> g
- updating: file 1/2 files (50.00%)
+ getting newfile
+ updating: newfile 1/2 files (50.00%)
+ updating: file 2/2 files (100.00%)
note: possible conflict - file was deleted and renamed to:
newfile
- updating: newfile 2/2 files (100.00%)
- getting newfile
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg status
--- a/tests/test-rename-merge2.t Sat Feb 09 15:21:58 2013 -0800
+++ b/tests/test-rename-merge2.t Sat Feb 09 15:22:04 2013 -0800
@@ -126,8 +126,8 @@
preserving b for resolve of b
rev: versions differ -> m
preserving rev for resolve of rev
+ getting a
updating: a 1/3 files (33.33%)
- getting a
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b and a to b
@@ -231,8 +231,8 @@
b: remote created -> g
rev: versions differ -> m
preserving rev for resolve of rev
+ getting b
updating: b 1/2 files (50.00%)
- getting b
updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
@@ -289,10 +289,10 @@
b: remote created -> g
rev: versions differ -> m
preserving rev for resolve of rev
+ removing a
updating: a 1/3 files (33.33%)
- removing a
+ getting b
updating: b 2/3 files (66.67%)
- getting b
updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
@@ -380,12 +380,12 @@
c: remote created -> g
rev: versions differ -> m
preserving rev for resolve of rev
- updating: a 1/3 files (33.33%)
+ getting c
+ updating: c 1/3 files (33.33%)
+ updating: a 2/3 files (66.67%)
note: possible conflict - a was renamed multiple times to:
b
c
- updating: c 2/3 files (66.67%)
- getting c
updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
@@ -439,8 +439,8 @@
preserving b for resolve of b
rev: versions differ -> m
preserving rev for resolve of rev
+ removing a
updating: a 1/3 files (33.33%)
- removing a
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
@@ -469,8 +469,8 @@
preserving b for resolve of b
rev: versions differ -> m
preserving rev for resolve of rev
+ getting a
updating: a 1/3 files (33.33%)
- getting a
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
@@ -500,8 +500,8 @@
preserving b for resolve of b
rev: versions differ -> m
preserving rev for resolve of rev
+ removing a
updating: a 1/3 files (33.33%)
- removing a
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
@@ -530,8 +530,8 @@
preserving b for resolve of b
rev: versions differ -> m
preserving rev for resolve of rev
+ getting a
updating: a 1/3 files (33.33%)
- getting a
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
@@ -591,8 +591,8 @@
preserving b for resolve of b
rev: versions differ -> m
preserving rev for resolve of rev
+ getting a
updating: a 1/3 files (33.33%)
- getting a
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
@@ -731,13 +731,13 @@
c: remote created -> g
rev: versions differ -> m
preserving rev for resolve of rev
- updating: b 1/3 files (33.33%)
+ getting c
+ updating: c 1/3 files (33.33%)
+ updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b and a to b
my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
premerge successful
- updating: c 2/3 files (66.67%)
- getting c
updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
--- a/tests/test-subrepo.t Sat Feb 09 15:21:58 2013 -0800
+++ b/tests/test-subrepo.t Sat Feb 09 15:22:04 2013 -0800
@@ -214,8 +214,8 @@
branchmerge: False, force: False, partial: False
ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a
t: remote is newer -> g
+ getting t
updating: t 1/1 files (100.00%)
- getting t
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg debugsub
--- a/tests/test-up-local-change.t Sat Feb 09 15:21:58 2013 -0800
+++ b/tests/test-up-local-change.t Sat Feb 09 15:22:04 2013 -0800
@@ -49,12 +49,12 @@
a: versions differ -> m
preserving a for resolve of a
b: remote created -> g
- updating: a 1/2 files (50.00%)
+ getting b
+ updating: b 1/2 files (50.00%)
+ updating: a 2/2 files (100.00%)
picked tool 'true' for a (binary False symlink False)
merging a
my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
- updating: b 2/2 files (100.00%)
- getting b
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ hg parents
changeset: 1:1e71731e6fbb
@@ -70,8 +70,8 @@
b: other deleted -> r
a: versions differ -> m
preserving a for resolve of a
+ removing b
updating: b 1/2 files (50.00%)
- removing b
updating: a 2/2 files (100.00%)
picked tool 'true' for a (binary False symlink False)
merging a
@@ -103,12 +103,12 @@
a: versions differ -> m
preserving a for resolve of a
b: remote created -> g
- updating: a 1/2 files (50.00%)
+ getting b
+ updating: b 1/2 files (50.00%)
+ updating: a 2/2 files (100.00%)
picked tool 'true' for a (binary False symlink False)
merging a
my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
- updating: b 2/2 files (100.00%)
- getting b
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ hg parents
changeset: 1:1e71731e6fbb
--- a/tests/test-update-reverse.t Sat Feb 09 15:21:58 2013 -0800
+++ b/tests/test-update-reverse.t Sat Feb 09 15:22:04 2013 -0800
@@ -71,12 +71,12 @@
side1: other deleted -> r
side2: other deleted -> r
main: remote created -> g
+ removing side1
updating: side1 1/3 files (33.33%)
- removing side1
+ removing side2
updating: side2 2/3 files (66.67%)
- removing side2
+ getting main
updating: main 3/3 files (100.00%)
- getting main
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ ls