Show More
@@ -37,7 +37,6 b' http://mercurial.selenic.com/bts/issue67' | |||||
37 | 1: other deleted -> r |
|
37 | 1: other deleted -> r | |
38 | 1a: remote created -> g |
|
38 | 1a: remote created -> g | |
39 | removing 1 |
|
39 | removing 1 | |
40 | updating: 1 1/2 files (50.00%) |
|
|||
41 | getting 1a |
|
40 | getting 1a | |
42 | updating: 1a 2/2 files (100.00%) |
|
41 | updating: 1a 2/2 files (100.00%) | |
43 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
42 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -45,11 +45,8 b'' | |||||
45 | b/a: remote created -> g |
|
45 | b/a: remote created -> g | |
46 | b/b: remote created -> g |
|
46 | b/b: remote created -> g | |
47 | removing a/a |
|
47 | removing a/a | |
48 | updating: a/a 1/5 files (20.00%) |
|
|||
49 | removing a/b |
|
48 | removing a/b | |
50 | updating: a/b 2/5 files (40.00%) |
|
|||
51 | getting b/a |
|
49 | getting b/a | |
52 | updating: b/a 3/5 files (60.00%) |
|
|||
53 | getting b/b |
|
50 | getting b/b | |
54 | updating: b/b 4/5 files (80.00%) |
|
51 | updating: b/b 4/5 files (80.00%) | |
55 | updating: a/c 5/5 files (100.00%) |
|
52 | updating: a/c 5/5 files (100.00%) |
@@ -290,7 +290,6 b' args:' | |||||
290 | rev: versions differ -> m |
|
290 | rev: versions differ -> m | |
291 | preserving rev for resolve of rev |
|
291 | preserving rev for resolve of rev | |
292 | removing a |
|
292 | removing a | |
293 | updating: a 1/3 files (33.33%) |
|
|||
294 | getting b |
|
293 | getting b | |
295 | updating: b 2/3 files (66.67%) |
|
294 | updating: b 2/3 files (66.67%) | |
296 | updating: rev 3/3 files (100.00%) |
|
295 | updating: rev 3/3 files (100.00%) |
@@ -72,9 +72,7 b'' | |||||
72 | side2: other deleted -> r |
|
72 | side2: other deleted -> r | |
73 | main: remote created -> g |
|
73 | main: remote created -> g | |
74 | removing side1 |
|
74 | removing side1 | |
75 | updating: side1 1/3 files (33.33%) |
|
|||
76 | removing side2 |
|
75 | removing side2 | |
77 | updating: side2 2/3 files (66.67%) |
|
|||
78 | getting main |
|
76 | getting main | |
79 | updating: main 3/3 files (100.00%) |
|
77 | updating: main 3/3 files (100.00%) | |
80 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
78 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now