123 > EOF |
123 > EOF |
124 $ hg histedit 6 --commands commands.txt |
124 $ hg histedit 6 --commands commands.txt |
125 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
125 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
126 |
126 |
127 |
127 |
128 Check that histedit respect phases |
|
129 ========================================= |
|
130 |
|
131 (not directly related to the test file but doesn't deserve it's own test case) |
|
132 |
|
133 $ hg log -G |
|
134 @ 9:c13eb81022ca f |
|
135 | |
|
136 o 6:b346ab9a313d c |
|
137 | |
|
138 o 0:cb9a9f314b8b a |
|
139 |
|
140 $ hg ph -pv '.^' |
|
141 phase changed for 2 changesets |
|
142 $ hg histedit -r '.~2' |
|
143 abort: cannot edit immutable changeset: cb9a9f314b8b |
|
144 [255] |
|
145 |
|
146 |
128 |
147 Test that rewriting leaving instability behind is allowed |
129 Test that rewriting leaving instability behind is allowed |
148 --------------------------------------------------------------------- |
130 --------------------------------------------------------------------- |
149 |
131 |
150 $ hg up '.^' |
132 $ hg up '.^' |
151 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
133 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
152 $ hg ph --force --draft '.' |
|
153 $ hg log -r 'children(.)' |
134 $ hg log -r 'children(.)' |
154 9:c13eb81022ca f (no-eol) |
135 9:c13eb81022ca f (no-eol) |
155 $ cat > commands.txt <<EOF |
136 $ cat > commands.txt <<EOF |
156 > edit b346ab9a313d 6 c |
137 > edit b346ab9a313d 6 c |
157 > EOF |
138 > EOF |
169 9:c13eb81022ca f (no-eol) |
150 9:c13eb81022ca f (no-eol) |
170 |
151 |
171 stabilise |
152 stabilise |
172 |
153 |
173 $ hg rebase -r 'unstable()' -d . |
154 $ hg rebase -r 'unstable()' -d . |
|
155 |
|
156 Check that histedit respect phases |
|
157 ========================================= |
|
158 |
|
159 (not directly related to the test file but doesn't deserve it's own test case) |
|
160 |
|
161 $ cat >> $HGRCPATH << EOF |
|
162 > [ui] |
|
163 > logtemplate= {rev}:{node|short} ({phase}) {desc|firstline}\n |
|
164 > EOF |
|
165 |
|
166 $ hg ph -pv '.^' |
|
167 phase changed for 2 changesets |
|
168 $ hg log -G |
|
169 @ 11:b449568bf7fc (draft) f |
|
170 | |
|
171 o 10:40db8afa467b (public) c |
|
172 | |
|
173 o 0:cb9a9f314b8b (public) a |
|
174 |
|
175 $ hg histedit -r '.~2' |
|
176 abort: cannot edit immutable changeset: cb9a9f314b8b |
|
177 [255] |
|
178 |
|
179 |