67 Go at a random point and try to continue |
67 Go at a random point and try to continue |
68 |
68 |
69 $ hg id -n |
69 $ hg id -n |
70 3+ |
70 3+ |
71 $ hg up 0 |
71 $ hg up 0 |
72 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
72 abort: histedit in progress |
73 $ HGEDITOR='echo foobaz > ' hg histedit --continue |
73 (use 'hg histedit --continue' or 'hg histedit --abort') |
74 abort: 055a42cdd887 is not an ancestor of working directory |
|
75 (update to 055a42cdd887 or descendant and run "hg histedit --continue" again) |
|
76 [255] |
74 [255] |
77 $ hg up 3 |
75 |
78 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
76 commit, then edit the revision (temporarily disable histedit to allow commit) |
79 |
77 $ hg ci -m 'wat' --config 'extensions.histedit=!' |
80 commit, then edit the revision |
|
81 $ hg ci -m 'wat' |
|
82 created new head |
78 created new head |
83 $ echo a > e |
79 $ echo a > e |
84 $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle |
80 $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle |
85 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
81 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
86 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
82 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |