equal
deleted
inserted
replaced
61 |
61 |
62 |
62 |
63 edit the history |
63 edit the history |
64 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle |
64 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle |
65 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
65 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
66 abort: Make changes as needed, you may commit or record as needed now. |
66 Make changes as needed, you may commit or record as needed now. |
67 When you are finished, run hg histedit --continue to resume. |
67 When you are finished, run hg histedit --continue to resume. |
68 |
68 |
69 Go at a random point and try to continue |
69 Go at a random point and try to continue |
70 |
70 |
71 $ hg id -n |
71 $ hg id -n |
149 $ cat > $EDITED <<EOF |
149 $ cat > $EDITED <<EOF |
150 > edit b5f70786f9b0 f |
150 > edit b5f70786f9b0 f |
151 > EOF |
151 > EOF |
152 $ HGEDITOR="cat \"$EDITED\" > " hg histedit tip 2>&1 | fixbundle |
152 $ HGEDITOR="cat \"$EDITED\" > " hg histedit tip 2>&1 | fixbundle |
153 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
153 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
154 abort: Make changes as needed, you may commit or record as needed now. |
154 Make changes as needed, you may commit or record as needed now. |
155 When you are finished, run hg histedit --continue to resume. |
155 When you are finished, run hg histedit --continue to resume. |
156 $ hg status |
156 $ hg status |
157 A f |
157 A f |
158 $ HGEDITOR='true' hg histedit --continue |
158 $ HGEDITOR='true' hg histedit --continue |
159 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
159 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |