Mercurial > hg

comparison tests/test-histedit-obsolete.t @ 52283:fad30cb98579

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit-continue: wire up `hg continue` and `histedit`
author Brian Hulette <bhulette@apache.org>
date Wed, 30 Oct 2024 19:38:56 -0700
parents f27a83399abb
children
comparison
equal deleted inserted replaced
52282:51a350a22d0c 52283:fad30cb98579
78 A d 78 A d
79 ? plan 79 ? plan
80 $ hg commit --amend -X . -m XXXXXX 80 $ hg commit --amend -X . -m XXXXXX
81 $ hg commit --amend -X . -m b2 81 $ hg commit --amend -X . -m b2
82 $ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup 82 $ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup
83 $ hg histedit --continue 83 $ hg continue
84 $ hg log -G 84 $ hg log -G
85 @ 8:273c1f3b8626 c 85 @ 8:273c1f3b8626 c
86 | 86 |
87 o 7:aba7da937030 b2 87 o 7:aba7da937030 b2
88 | 88 |
361 0 files updated, 0 files merged, 6 files removed, 0 files unresolved 361 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
362 Editing (b449568bf7fc), commit as needed now to split the change 362 Editing (b449568bf7fc), commit as needed now to split the change
363 (to edit b449568bf7fc, `hg histedit --continue` after making changes) 363 (to edit b449568bf7fc, `hg histedit --continue` after making changes)
364 [240] 364 [240]
365 $ echo f >> f 365 $ echo f >> f
366 $ hg histedit --continue 366 $ hg continue
367 $ hg log -G 367 $ hg log -G
368 @ 24:12e89af74238 (secret) k 368 @ 24:12e89af74238 (secret) k
369 | 369 |
370 o 23:636a8687b22e (secret) j 370 o 23:636a8687b22e (secret) j
371 | 371 |
567 > edit ee118ab9fa44 18 k 567 > edit ee118ab9fa44 18 k
568 > EOF 568 > EOF
569 Editing (ee118ab9fa44), commit as needed now to split the change 569 Editing (ee118ab9fa44), commit as needed now to split the change
570 (to edit ee118ab9fa44, `hg histedit --continue` after making changes) 570 (to edit ee118ab9fa44, `hg histedit --continue` after making changes)
571 [240] 571 [240]
572 $ hg histedit --continue --config experimental.evolution.track-operation=1 572 $ hg continue --config experimental.evolution.track-operation=1
573 $ hg log -G 573 $ hg log -G
574 @ 23:175d6b286a22 (secret) k 574 @ 23:175d6b286a22 (secret) k
575 | 575 |
576 o 22:44ca09d59ae4 (secret) j 576 o 22:44ca09d59ae4 (secret) j
577 | 577 |