74 -huit |
74 -huit |
75 +eight |
75 +eight |
76 neuf |
76 neuf |
77 dix |
77 dix |
78 $ hg amend |
78 $ hg amend |
79 1 new orphan changesets |
79 1 new unstable changesets |
80 $ hg evolve |
80 $ hg evolve |
81 move:[2] babar count up to fifteen |
81 move:[2] babar count up to fifteen |
82 atop:[3] babar count up to ten |
82 atop:[4] babar count up to ten |
83 merging babar |
83 merging babar |
84 working directory is now at 71c18f70c34f |
84 working directory is now at 71c18f70c34f |
85 $ hg resolve -l |
85 $ hg resolve -l |
86 $ hg log -G |
86 $ hg log -G |
87 @ changeset: 4:71c18f70c34f |
87 @ changeset: 5:71c18f70c34f |
88 | tag: tip |
88 | tag: tip |
89 | user: test |
89 | user: test |
90 | date: Thu Jan 01 00:00:00 1970 +0000 |
90 | date: Thu Jan 01 00:00:00 1970 +0000 |
91 | summary: babar count up to fifteen |
91 | summary: babar count up to fifteen |
92 | |
92 | |
93 o changeset: 3:5977072d13c5 |
93 o changeset: 4:5977072d13c5 |
94 | parent: 0:29ec1554cfaf |
94 | parent: 0:29ec1554cfaf |
95 | user: test |
95 | user: test |
96 | date: Thu Jan 01 00:00:00 1970 +0000 |
96 | date: Thu Jan 01 00:00:00 1970 +0000 |
97 | summary: babar count up to ten |
97 | summary: babar count up to ten |
98 | |
98 | |
107 -------------------------------------------------- |
107 -------------------------------------------------- |
108 |
108 |
109 $ hg gdown |
109 $ hg gdown |
110 gdown have been deprecated in favor of previous |
110 gdown have been deprecated in favor of previous |
111 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
111 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
112 [3] babar count up to ten |
112 [4] babar count up to ten |
113 $ safesed 's/dix/ten/' babar |
113 $ safesed 's/dix/ten/' babar |
114 $ hg diff |
114 $ hg diff |
115 diff -r 5977072d13c5 babar |
115 diff -r 5977072d13c5 babar |
116 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
116 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
117 +++ b/babar Thu Jan 01 00:00:00 1970 +0000 |
117 +++ b/babar * (glob) |
118 @@ -7,4 +7,4 @@ |
118 @@ -7,4 +7,4 @@ |
119 sept |
119 sept |
120 eight |
120 eight |
121 neuf |
121 neuf |
122 -dix |
122 -dix |
123 +ten |
123 +ten |
124 $ hg amend |
124 $ hg amend |
125 1 new orphan changesets |
125 1 new unstable changesets |
126 $ hg evolve |
126 $ hg evolve |
127 move:[4] babar count up to fifteen |
127 move:[5] babar count up to fifteen |
128 atop:[5] babar count up to ten |
128 atop:[7] babar count up to ten |
129 merging babar |
129 merging babar |
130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') |
130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') |
131 evolve failed! |
131 evolve failed! |
132 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
132 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
133 abort: unresolved merge conflicts (see hg help resolve) |
133 abort: unresolved merge conflicts (see hg help resolve) |
134 [255] |
134 [255] |
135 $ hg resolve -l |
135 $ hg resolve -l |
136 U babar |
136 U babar |
137 $ hg log -G |
137 $ hg log -G |
138 @ changeset: 5:e04690b09bc6 |
138 @ changeset: 7:e04690b09bc6 |
139 | tag: tip |
139 | tag: tip |
140 | parent: 0:29ec1554cfaf |
140 | parent: 0:29ec1554cfaf |
141 | user: test |
141 | user: test |
142 | date: Thu Jan 01 00:00:00 1970 +0000 |
142 | date: Thu Jan 01 00:00:00 1970 +0000 |
143 | summary: babar count up to ten |
143 | summary: babar count up to ten |
144 | |
144 | |
145 | o changeset: 4:71c18f70c34f |
145 | o changeset: 5:71c18f70c34f |
146 | | user: test |
146 | | user: test |
147 | | date: Thu Jan 01 00:00:00 1970 +0000 |
147 | | date: Thu Jan 01 00:00:00 1970 +0000 |
148 | | instability: orphan |
148 | | trouble: unstable |
149 | | summary: babar count up to fifteen |
149 | | summary: babar count up to fifteen |
150 | | |
150 | | |
151 | x changeset: 3:5977072d13c5 |
151 | x changeset: 4:5977072d13c5 |
152 |/ parent: 0:29ec1554cfaf |
152 |/ parent: 0:29ec1554cfaf |
153 | user: test |
153 | user: test |
154 | date: Thu Jan 01 00:00:00 1970 +0000 |
154 | date: Thu Jan 01 00:00:00 1970 +0000 |
155 | obsolete: amended using amend as 5:e04690b09bc6 |
155 | obsolete: amended as e04690b09bc6 |
156 | summary: babar count up to ten |
156 | summary: babar count up to ten |
157 | |
157 | |
158 o changeset: 0:29ec1554cfaf |
158 o changeset: 0:29ec1554cfaf |
159 user: test |
159 user: test |
160 date: Thu Jan 01 00:00:00 1970 +0000 |
160 date: Thu Jan 01 00:00:00 1970 +0000 |
161 summary: babar count up to five |
161 summary: babar count up to five |
162 |
162 |
163 (fix the conflict and continue) |
163 (fix the conflict and continue) |
164 |
164 |
165 $ hg revert -r 71c18f70c34f --all |
165 $ hg revert -r 5 --all |
166 reverting babar |
166 reverting babar |
167 $ safesed 's/dix/ten/' babar |
167 $ safesed 's/dix/ten/' babar |
168 $ hg resolve --all -m |
168 $ hg resolve --all -m |
169 (no more unresolved files) |
169 (no more unresolved files) |
170 continue: hg evolve --continue |
170 continue: hg evolve --continue |
171 $ hg evolve --continue |
171 $ hg evolve --continue |
172 evolving 4:71c18f70c34f "babar count up to fifteen" |
172 evolving 5:71c18f70c34f "babar count up to fifteen" |
173 working directory is now at 1836b91c6c1d |
173 working directory is now at 1836b91c6c1d |
174 $ hg resolve -l |
174 $ hg resolve -l |
175 $ hg log -G |
175 $ hg log -G |
176 @ changeset: 6:1836b91c6c1d |
176 @ changeset: 8:1836b91c6c1d |
177 | tag: tip |
177 | tag: tip |
178 | user: test |
178 | user: test |
179 | date: Thu Jan 01 00:00:00 1970 +0000 |
179 | date: Thu Jan 01 00:00:00 1970 +0000 |
180 | summary: babar count up to fifteen |
180 | summary: babar count up to fifteen |
181 | |
181 | |
182 o changeset: 5:e04690b09bc6 |
182 o changeset: 7:e04690b09bc6 |
183 | parent: 0:29ec1554cfaf |
183 | parent: 0:29ec1554cfaf |
184 | user: test |
184 | user: test |
185 | date: Thu Jan 01 00:00:00 1970 +0000 |
185 | date: Thu Jan 01 00:00:00 1970 +0000 |
186 | summary: babar count up to ten |
186 | summary: babar count up to ten |
187 | |
187 | |
196 $ safesed 's/merge=.*/merge=touch/' $HGRCPATH |
196 $ safesed 's/merge=.*/merge=touch/' $HGRCPATH |
197 $ safesed 's/touch.gui=.*/touch.gui=false/' $HGRCPATH |
197 $ safesed 's/touch.gui=.*/touch.gui=false/' $HGRCPATH |
198 $ hg gdown |
198 $ hg gdown |
199 gdown have been deprecated in favor of previous |
199 gdown have been deprecated in favor of previous |
200 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
200 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
201 [5] babar count up to ten |
201 [7] babar count up to ten |
202 $ safesed 's/ten/zehn/' babar |
202 $ safesed 's/ten/zehn/' babar |
203 $ hg diff |
203 $ hg diff |
204 diff -r e04690b09bc6 babar |
204 diff -r e04690b09bc6 babar |
205 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
205 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
206 +++ b/babar Thu Jan 01 00:00:00 1970 +0000 |
206 +++ b/babar * (glob) |
207 @@ -7,4 +7,4 @@ |
207 @@ -7,4 +7,4 @@ |
208 sept |
208 sept |
209 eight |
209 eight |
210 neuf |
210 neuf |
211 -ten |
211 -ten |
212 +zehn |
212 +zehn |
213 $ hg amend |
213 $ hg amend |
214 1 new orphan changesets |
214 1 new unstable changesets |
215 $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH |
215 $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH |
216 $ hg evolve --tool touch <<EOF |
216 $ hg evolve --tool touch <<EOF |
217 > n |
217 > n |
218 > EOF |
218 > EOF |
219 move:[6] babar count up to fifteen |
219 move:[8] babar count up to fifteen |
220 atop:[7] babar count up to ten |
220 atop:[10] babar count up to ten |
221 merging babar |
221 merging babar |
222 output file babar appears unchanged |
222 output file babar appears unchanged |
223 was merge successful (yn)? n |
223 was merge successful (yn)? n |
224 merging babar failed! |
224 merging babar failed! |
225 evolve failed! |
225 evolve failed! |
227 abort: unresolved merge conflicts (see hg help resolve) |
227 abort: unresolved merge conflicts (see hg help resolve) |
228 [255] |
228 [255] |
229 $ hg resolve -l |
229 $ hg resolve -l |
230 U babar |
230 U babar |
231 $ hg log -G |
231 $ hg log -G |
232 @ changeset: 7:b20d08eea373 |
232 @ changeset: 10:b20d08eea373 |
233 | tag: tip |
233 | tag: tip |
234 | parent: 0:29ec1554cfaf |
234 | parent: 0:29ec1554cfaf |
235 | user: test |
235 | user: test |
236 | date: Thu Jan 01 00:00:00 1970 +0000 |
236 | date: Thu Jan 01 00:00:00 1970 +0000 |
237 | summary: babar count up to ten |
237 | summary: babar count up to ten |
238 | |
238 | |
239 | o changeset: 6:1836b91c6c1d |
239 | o changeset: 8:1836b91c6c1d |
240 | | user: test |
240 | | user: test |
241 | | date: Thu Jan 01 00:00:00 1970 +0000 |
241 | | date: Thu Jan 01 00:00:00 1970 +0000 |
242 | | instability: orphan |
242 | | trouble: unstable |
243 | | summary: babar count up to fifteen |
243 | | summary: babar count up to fifteen |
244 | | |
244 | | |
245 | x changeset: 5:e04690b09bc6 |
245 | x changeset: 7:e04690b09bc6 |
246 |/ parent: 0:29ec1554cfaf |
246 |/ parent: 0:29ec1554cfaf |
247 | user: test |
247 | user: test |
248 | date: Thu Jan 01 00:00:00 1970 +0000 |
248 | date: Thu Jan 01 00:00:00 1970 +0000 |
249 | obsolete: amended using amend as 7:b20d08eea373 |
249 | obsolete: amended as b20d08eea373 |
250 | summary: babar count up to ten |
250 | summary: babar count up to ten |
251 | |
251 | |
252 o changeset: 0:29ec1554cfaf |
252 o changeset: 0:29ec1554cfaf |
253 user: test |
253 user: test |
254 date: Thu Jan 01 00:00:00 1970 +0000 |
254 date: Thu Jan 01 00:00:00 1970 +0000 |