equal
deleted
inserted
replaced
61 dirty a file |
61 dirty a file |
62 $ echo a > g |
62 $ echo a > g |
63 $ hg histedit 177f92b77385 --commands - 2>&1 << EOF |
63 $ hg histedit 177f92b77385 --commands - 2>&1 << EOF |
64 > EOF |
64 > EOF |
65 abort: uncommitted changes |
65 abort: uncommitted changes |
66 [255] |
66 [20] |
67 $ echo g > g |
67 $ echo g > g |
68 |
68 |
69 edit the history |
69 edit the history |
70 $ hg histedit 177f92b77385 --commands - 2>&1 << EOF| fixbundle |
70 $ hg histedit 177f92b77385 --commands - 2>&1 << EOF| fixbundle |
71 > pick 177f92b77385 c |
71 > pick 177f92b77385 c |
80 |
80 |
81 try to update and get an error |
81 try to update and get an error |
82 $ hg update tip |
82 $ hg update tip |
83 abort: histedit in progress |
83 abort: histedit in progress |
84 (use 'hg histedit --continue' or 'hg histedit --abort') |
84 (use 'hg histedit --continue' or 'hg histedit --abort') |
85 [255] |
85 [20] |
86 |
86 |
87 edit the plan via the editor |
87 edit the plan via the editor |
88 $ cat >> $TESTTMP/editplan.sh <<EOF |
88 $ cat >> $TESTTMP/editplan.sh <<EOF |
89 > cat > \$1 <<EOF2 |
89 > cat > \$1 <<EOF2 |
90 > drop e860deea161a e |
90 > drop e860deea161a e |
134 $ hg id -n |
134 $ hg id -n |
135 3+ |
135 3+ |
136 $ hg up 0 |
136 $ hg up 0 |
137 abort: histedit in progress |
137 abort: histedit in progress |
138 (use 'hg histedit --continue' or 'hg histedit --abort') |
138 (use 'hg histedit --continue' or 'hg histedit --abort') |
139 [255] |
139 [20] |
140 |
140 |
141 Try to delete necessary commit |
141 Try to delete necessary commit |
142 $ hg strip -r 652413b |
142 $ hg strip -r 652413b |
143 abort: histedit in progress, can't strip 652413bf663e |
143 abort: histedit in progress, can't strip 652413bf663e |
144 [255] |
144 [255] |
151 qnew should fail while we're in the middle of the edit step |
151 qnew should fail while we're in the middle of the edit step |
152 |
152 |
153 $ hg --config extensions.mq= qnew please-fail |
153 $ hg --config extensions.mq= qnew please-fail |
154 abort: histedit in progress |
154 abort: histedit in progress |
155 (use 'hg histedit --continue' or 'hg histedit --abort') |
155 (use 'hg histedit --continue' or 'hg histedit --abort') |
156 [255] |
156 [20] |
157 $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle |
157 $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle |
158 |
158 |
159 $ hg log --graph |
159 $ hg log --graph |
160 @ changeset: 6:b5f70786f9b0 |
160 @ changeset: 6:b5f70786f9b0 |
161 | tag: tip |
161 | tag: tip |