Mercurial > evolve

comparison tests/test-evolve-abort-contentdiv.t @ 4363:a2fdbece7ce1 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 22 Jan 2019 12:57:25 -0500
parents 684cc3418ecd
children
comparison
equal deleted inserted replaced
4362:8bd60e09dfb4 4363:a2fdbece7ce1
43 43
44 $ echo bar > d 44 $ echo bar > d
45 $ hg amend 45 $ hg amend
46 46
47 $ hg up c41c793e0ef1 --hidden 47 $ hg up c41c793e0ef1 --hidden
48 updating to a hidden changeset c41c793e0ef1
49 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
51 working directory parent is obsolete! (c41c793e0ef1) 49 working directory parent is obsolete! (c41c793e0ef1)
52 (use 'hg evolve' to update to its successor: e49523854bc8) 50 (use 'hg evolve' to update to its successor: e49523854bc8)
53 51
54 $ echo foobar > d 52 $ echo foobar > d
55 $ hg amend 53 $ hg amend
56 2 new content-divergent changesets
57 $ hg glog --hidden 54 $ hg glog --hidden
58 @ 6:9c1631e352d9 added d 55 @ 6:9c1631e352d9 added d
59 | () draft 56 | () draft
60 | * 5:e49523854bc8 added d 57 | o 5:e49523854bc8 added d
61 |/ () draft 58 |/ () draft
62 | x 4:c41c793e0ef1 added d 59 | x 4:c41c793e0ef1 added d
63 |/ () draft 60 |/ () draft
64 o 3:ca1b80f7960a added c 61 o 3:ca1b80f7960a added c
65 | () draft 62 | () draft
118 working directory is now at 9c1631e352d9 115 working directory is now at 9c1631e352d9
119 116
120 $ hg glog --hidden 117 $ hg glog --hidden
121 @ 6:9c1631e352d9 added d 118 @ 6:9c1631e352d9 added d
122 | () draft 119 | () draft
123 | * 5:e49523854bc8 added d 120 | o 5:e49523854bc8 added d
124 |/ () draft 121 |/ () draft
125 | x 4:c41c793e0ef1 added d 122 | x 4:c41c793e0ef1 added d
126 |/ () draft 123 |/ () draft
127 o 3:ca1b80f7960a added c 124 o 3:ca1b80f7960a added c
128 | () draft 125 | () draft
141 $ hg amend 138 $ hg amend
142 $ hg up .^ 139 $ hg up .^
143 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 140 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
144 $ echo bar > c 141 $ echo bar > c
145 $ hg amend 142 $ hg amend
146 2 new orphan changesets
147 $ hg up ca1b80f7960a --hidden 143 $ hg up ca1b80f7960a --hidden
148 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 144 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
149 working directory parent is obsolete! (ca1b80f7960a) 145 working directory parent is obsolete! (ca1b80f7960a)
150 (use 'hg evolve' to update to its successor: 2ba73e31f264) 146 (use 'hg evolve' to update to its successor: 2ba73e31f264)
151 $ echo foobar > c 147 $ echo foobar > c
152 $ hg amend 148 $ hg amend
153 2 new content-divergent changesets
154 $ echo bar > c 149 $ echo bar > c
155 $ hg amend 150 $ hg amend
156 151
157 $ hg glog --hidden 152 $ hg glog --hidden
158 @ 10:491e10505bae added c 153 @ 10:491e10505bae added c
159 | () draft 154 | () draft
160 | x 9:7398f702a162 added c 155 | x 9:7398f702a162 added c
161 |/ () draft 156 |/ () draft
162 | * 8:2ba73e31f264 added c 157 | o 8:2ba73e31f264 added c
163 |/ () draft 158 |/ () draft
164 | * 7:f0f1694f123e added d 159 | o 7:f0f1694f123e added d
165 | | () draft 160 | | () draft
166 | | x 6:9c1631e352d9 added d 161 | | x 6:9c1631e352d9 added d
167 | |/ () draft 162 | |/ () draft
168 | | * 5:e49523854bc8 added d 163 | | o 5:e49523854bc8 added d
169 | |/ () draft 164 | |/ () draft
170 | | x 4:c41c793e0ef1 added d 165 | | x 4:c41c793e0ef1 added d
171 | |/ () draft 166 | |/ () draft
172 | x 3:ca1b80f7960a added c 167 | x 3:ca1b80f7960a added c
173 |/ () draft 168 |/ () draft
195 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 190 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
196 fix conflicts and see `hg help evolve.interrupted` 191 fix conflicts and see `hg help evolve.interrupted`
197 [1] 192 [1]
198 193
199 $ hg evolve --abort 194 $ hg evolve --abort
200 2 new content-divergent changesets
201 evolve aborted 195 evolve aborted
202 working directory is now at 491e10505bae 196 working directory is now at 491e10505bae
203 197
204 $ hg glog --hidden 198 $ hg glog --hidden
205 @ 10:491e10505bae added c 199 @ 10:491e10505bae added c
206 | () draft 200 | () draft
207 | x 9:7398f702a162 added c 201 | x 9:7398f702a162 added c
208 |/ () draft 202 |/ () draft
209 | * 8:2ba73e31f264 added c 203 | o 8:2ba73e31f264 added c
210 |/ () draft 204 |/ () draft
211 | * 7:f0f1694f123e added d 205 | o 7:f0f1694f123e added d
212 | | () draft 206 | | () draft
213 | | x 6:9c1631e352d9 added d 207 | | x 6:9c1631e352d9 added d
214 | |/ () draft 208 | |/ () draft
215 | | * 5:e49523854bc8 added d 209 | | o 5:e49523854bc8 added d
216 | |/ () draft 210 | |/ () draft
217 | | x 4:c41c793e0ef1 added d 211 | | x 4:c41c793e0ef1 added d
218 | |/ () draft 212 | |/ () draft
219 | x 3:ca1b80f7960a added c 213 | x 3:ca1b80f7960a added c
220 |/ () draft 214 |/ () draft
224 | () draft 218 | () draft
225 o 0:8fa14d15e168 added hgignore 219 o 0:8fa14d15e168 added hgignore
226 () draft 220 () draft
227 221
228 $ hg obslog -r . --all 222 $ hg obslog -r . --all
229 * 2ba73e31f264 (8) added c 223 o 2ba73e31f264 (8) added c
230 | 224 |
231 | @ 491e10505bae (10) added c 225 | @ 491e10505bae (10) added c
232 | | 226 | |
233 | x 7398f702a162 (9) added c 227 | x 7398f702a162 (9) added c
234 |/ rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000) 228 |/ rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000)
267 $ echo bar > c 261 $ echo bar > c
268 $ hg add c 262 $ hg add c
269 $ hg amend 263 $ hg amend
270 264
271 $ hg up --hidden c41c793e0ef1 265 $ hg up --hidden c41c793e0ef1
272 updating to a hidden changeset c41c793e0ef1
273 (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d)
274 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 266 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
275 working directory parent is obsolete! (c41c793e0ef1) 267 working directory parent is obsolete! (c41c793e0ef1)
276 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) 268 (use 'hg evolve' to update to its successor: 69bdd23a9b0d)
277 $ echo bar > d 269 $ echo bar > d
278 $ hg amend 270 $ hg amend
279 2 new content-divergent changesets
280 271
281 $ hg glog 272 $ hg glog
282 @ 7:e49523854bc8 added d 273 @ 7:e49523854bc8 added d
283 | () draft 274 | () draft
284 | * 6:69bdd23a9b0d added d 275 | o 6:69bdd23a9b0d added d
285 | | () draft 276 | | () draft
286 o | 3:ca1b80f7960a added c 277 o | 3:ca1b80f7960a added c
287 | | () draft 278 | | () draft
288 o | 2:b1661037fa25 added b 279 o | 2:b1661037fa25 added b
289 |/ () draft 280 |/ () draft
307 working directory is now at e49523854bc8 298 working directory is now at e49523854bc8
308 299
309 $ hg glog 300 $ hg glog
310 @ 7:e49523854bc8 added d 301 @ 7:e49523854bc8 added d
311 | () draft 302 | () draft
312 | * 6:69bdd23a9b0d added d 303 | o 6:69bdd23a9b0d added d
313 | | () draft 304 | | () draft
314 o | 3:ca1b80f7960a added c 305 o | 3:ca1b80f7960a added c
315 | | () draft 306 | | () draft
316 o | 2:b1661037fa25 added b 307 o | 2:b1661037fa25 added b
317 |/ () draft 308 |/ () draft
331 $ hg amend 322 $ hg amend
332 323
333 $ hg glog 324 $ hg glog
334 @ 8:33e4442acf98 added d 325 @ 8:33e4442acf98 added d
335 | () draft 326 | () draft
336 | * 7:e49523854bc8 added d 327 | o 7:e49523854bc8 added d
337 | | () draft 328 | | () draft
338 | o 3:ca1b80f7960a added c 329 | o 3:ca1b80f7960a added c
339 | | () draft 330 | | () draft
340 | o 2:b1661037fa25 added b 331 | o 2:b1661037fa25 added b
341 |/ () draft 332 |/ () draft
362 working directory is now at 33e4442acf98 353 working directory is now at 33e4442acf98
363 354
364 $ hg glog 355 $ hg glog
365 @ 8:33e4442acf98 added d 356 @ 8:33e4442acf98 added d
366 | () draft 357 | () draft
367 | * 7:e49523854bc8 added d 358 | o 7:e49523854bc8 added d
368 | | () draft 359 | | () draft
369 | o 3:ca1b80f7960a added c 360 | o 3:ca1b80f7960a added c
370 | | () draft 361 | | () draft
371 | o 2:b1661037fa25 added b 362 | o 2:b1661037fa25 added b
372 |/ () draft 363 |/ () draft