##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)
Thomas Arendsen Hein -
r2552:bb403d42 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,152 +1,152
1 1 (the addremove command is deprecated; use add and remove --after instead)
2 2 adding a
3 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 5 diff -r 33aaa84a386b a
6 6 --- a/a
7 7 +++ b/a
8 8 @@ -1,1 +1,1 @@ a
9 9 -a
10 10 +abc
11 11 (the addremove command is deprecated; use add and remove --after instead)
12 12 adding b
13 13 M a
14 14 changeset: 0:33aaa84a386b
15 15 user: test
16 16 date: Mon Jan 12 13:46:40 1970 +0000
17 17 summary: 1
18 18
19 19 resolving manifests
20 20 force None allow None moddirstate True linear True
21 21 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
22 22 a versions differ, resolve
23 23 remote created b
24 24 getting b
25 25 merging a
26 26 resolving a
27 27 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
28 28 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
29 29 changeset: 1:802f095af299
30 30 tag: tip
31 31 user: test
32 32 date: Mon Jan 12 13:46:40 1970 +0000
33 33 summary: 2
34 34
35 35 resolving manifests
36 36 force None allow None moddirstate True linear True
37 37 ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c
38 38 remote deleted b
39 39 removing b
40 40 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
41 41 changeset: 0:33aaa84a386b
42 42 user: test
43 43 date: Mon Jan 12 13:46:40 1970 +0000
44 44 summary: 1
45 45
46 abort: there is nothing to merge, just use 'hg update'
46 abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'
47 47 failed
48 48 changeset: 0:33aaa84a386b
49 49 user: test
50 50 date: Mon Jan 12 13:46:40 1970 +0000
51 51 summary: 1
52 52
53 53 resolving manifests
54 54 force None allow None moddirstate True linear True
55 55 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
56 56 a versions differ, resolve
57 57 remote created b
58 58 getting b
59 59 merging a
60 60 resolving a
61 61 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
62 62 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
63 63 changeset: 1:802f095af299
64 64 tag: tip
65 65 user: test
66 66 date: Mon Jan 12 13:46:40 1970 +0000
67 67 summary: 2
68 68
69 69 changeset: 1:802f095af299cde27a85b2f056aef3829870956c
70 70 tag: tip
71 71 user: test
72 72 date: Mon Jan 12 13:46:40 1970 +0000
73 73 files: a b
74 74 description:
75 75 2
76 76
77 77
78 78 changeset: 0:33aaa84a386bd609094aeb21a97c09436c482ef1
79 79 user: test
80 80 date: Mon Jan 12 13:46:40 1970 +0000
81 81 files: a
82 82 description:
83 83 1
84 84
85 85
86 86 diff -r 802f095af299 a
87 87 --- a/a
88 88 +++ b/a
89 89 @@ -1,1 +1,1 @@ a2
90 90 -a2
91 91 +abc
92 92 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
93 93 (the addremove command is deprecated; use add and remove --after instead)
94 94 adding b
95 95 M a
96 96 changeset: 1:802f095af299
97 97 user: test
98 98 date: Mon Jan 12 13:46:40 1970 +0000
99 99 summary: 2
100 100
101 101 resolving manifests
102 102 force None allow None moddirstate True linear False
103 103 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
104 104 a versions differ, resolve
105 105 b versions differ, resolve
106 106 this update spans a branch affecting the following files:
107 107 a (resolve)
108 108 b (resolve)
109 109 aborting update spanning branches!
110 110 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)
111 111 failed
112 112 abort: outstanding uncommitted changes
113 113 failed
114 114 resolving manifests
115 115 force False allow True moddirstate True linear False
116 116 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
117 117 a versions differ, resolve
118 118 b versions differ, resolve
119 119 merging a
120 120 resolving a
121 121 file a: my d730145abbf9 other 13e0d5f949fa ancestor b789fdd96dc2
122 122 merging b
123 123 resolving b
124 124 file b: my 1e88685f5dde other 61de8c7723ca ancestor 000000000000
125 125 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
126 126 (branch merge, don't forget to commit)
127 127 changeset: 1:802f095af299
128 128 user: test
129 129 date: Mon Jan 12 13:46:40 1970 +0000
130 130 summary: 2
131 131
132 132 changeset: 2:030602aee63d
133 133 tag: tip
134 134 parent: 0:33aaa84a386b
135 135 user: test
136 136 date: Mon Jan 12 13:46:40 1970 +0000
137 137 summary: 3
138 138
139 139 diff -r 802f095af299 a
140 140 --- a/a
141 141 +++ b/a
142 142 @@ -1,1 +1,1 @@ a2
143 143 -a2
144 144 +abc
145 145 adding a
146 146 pulling from ../a
147 147 requesting all changes
148 148 adding changesets
149 149 adding manifests
150 150 adding file changes
151 151 added 1 changesets with 1 changes to 1 files
152 152 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
General Comments 0
You need to be logged in to leave comments. Login now