Mercurial > evolve
comparison tests/test-fixup.t @ 6201:d18e16b9b793
fixup: support hg continue
| author | Luke Granger-Brown <hg@lukegb.com> |
|---|---|
| date | Mon, 14 Mar 2022 16:46:38 +0000 |
| parents | 4a837da84f5f |
| children | d0f0a7b68d2d |
comparison
equal
deleted
inserted
replaced
| 6200:ceab1399302c | 6201:d18e16b9b793 |
|---|---|
| 256 $ hg evolve | 256 $ hg evolve |
| 257 update:[13] update foo | 257 update:[13] update foo |
| 258 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | 258 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 259 working directory is now at fed7e534b3bb | 259 working directory is now at fed7e534b3bb |
| 260 | 260 |
| 261 testing continue command | |
| 262 | |
| 263 $ hg up -r 'desc("baz")' | |
| 264 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 265 $ echo 'not foo' > foo | |
| 266 | |
| 267 $ hg fixup -r 'desc("update foo")' | |
| 268 merging foo | |
| 269 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | |
| 270 unresolved merge conflicts | |
| 271 (see 'hg help evolve.interrupted') | |
| 272 [240] | |
| 273 $ echo 'bonjour fixed' > foo | |
| 274 $ hg resolve --mark foo | |
| 275 (no more unresolved files) | |
| 276 continue: hg fixup --continue | |
| 277 | |
| 278 $ hg continue | |
| 279 evolving 14:6b0b1270d7dd "temporary fixup commit" | |
| 280 | |
| 281 $ hg glog | |
| 282 o 16:0dd54868f420 update foo | |
| 283 | () draft | |
| 284 | @ 14:6b0b1270d7dd temporary fixup commit | |
| 285 | | () secret | |
| 286 | o 9:12b5e442244f baz | |
| 287 | | () secret | |
| 288 | o 5:2eec5320cfc7 bar | |
| 289 |/ () draft | |
| 290 o 0:e63c23eaa88a foo | |
| 291 () draft | |
| 292 | |
| 293 $ hg evolve | |
| 294 update:[16] update foo | |
| 295 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 296 working directory is now at 0dd54868f420 | |
| 297 | |
| 261 amending a descendant of wdp | 298 amending a descendant of wdp |
| 262 | 299 |
| 263 $ hg up 0 | 300 $ hg up 0 |
| 264 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 301 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 265 $ echo foobar > foobar | 302 $ echo foobar > foobar |
| 266 $ hg add foobar | 303 $ hg add foobar |
| 267 $ hg fixup -r 'desc(baz)' | 304 $ hg fixup -r 'desc(baz)' |
| 268 $ hg glog | 305 $ hg glog |
| 269 o 16:b50fd0850076 baz | 306 o 19:b50fd0850076 baz |
| 270 | () secret | 307 | () secret |
| 271 | @ 14:4a9c4d14d447 temporary fixup commit | 308 | @ 17:4a9c4d14d447 temporary fixup commit |
| 272 | | () draft | 309 | | () draft |
| 273 | | o 13:fed7e534b3bb update foo | 310 | | o 16:0dd54868f420 update foo |
| 274 | |/ () draft | 311 | |/ () draft |
| 275 o | 5:2eec5320cfc7 bar | 312 o | 5:2eec5320cfc7 bar |
| 276 |/ () draft | 313 |/ () draft |
| 277 o 0:e63c23eaa88a foo | 314 o 0:e63c23eaa88a foo |
| 278 () draft | 315 () draft |
| 279 | 316 |
| 280 $ hg evolve | 317 $ hg evolve |
| 281 update:[16] baz | 318 update:[19] baz |
| 282 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 319 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 283 working directory is now at b50fd0850076 | 320 working directory is now at b50fd0850076 |
| 284 | 321 |
| 285 $ hg glog | 322 $ hg glog |
| 286 @ 16:b50fd0850076 baz | 323 @ 19:b50fd0850076 baz |
| 287 | () secret | 324 | () secret |
| 288 | o 13:fed7e534b3bb update foo | 325 | o 16:0dd54868f420 update foo |
| 289 | | () draft | 326 | | () draft |
| 290 o | 5:2eec5320cfc7 bar | 327 o | 5:2eec5320cfc7 bar |
| 291 |/ () draft | 328 |/ () draft |
| 292 o 0:e63c23eaa88a foo | 329 o 0:e63c23eaa88a foo |
| 293 () draft | 330 () draft |