equal
deleted
inserted
replaced
264 $ hg commit -Aqm "hello" |
264 $ hg commit -Aqm "hello" |
265 $ hg phase -r 0 --public |
265 $ hg phase -r 0 --public |
266 $ hg fix -r 0 |
266 $ hg fix -r 0 |
267 abort: cannot fix public changesets |
267 abort: cannot fix public changesets |
268 (see 'hg help phases' for details) |
268 (see 'hg help phases' for details) |
269 [255] |
269 [10] |
270 $ hg fix -r 0 --working-dir |
270 $ hg fix -r 0 --working-dir |
271 abort: cannot fix public changesets |
271 abort: cannot fix public changesets |
272 (see 'hg help phases' for details) |
272 (see 'hg help phases' for details) |
273 [255] |
273 [10] |
274 $ hg cat -r tip hello.whole |
274 $ hg cat -r tip hello.whole |
275 hello |
275 hello |
276 $ cat hello.whole |
276 $ cat hello.whole |
277 hello |
277 hello |
278 |
278 |
1172 $ hg commit -Aqm "first" |
1172 $ hg commit -Aqm "first" |
1173 $ printf "two\n" > foo.whole |
1173 $ printf "two\n" > foo.whole |
1174 $ hg commit -m "second" |
1174 $ hg commit -m "second" |
1175 $ hg --config experimental.evolution.allowunstable=False fix -r '.^' |
1175 $ hg --config experimental.evolution.allowunstable=False fix -r '.^' |
1176 abort: cannot fix changeset with children |
1176 abort: cannot fix changeset with children |
1177 [255] |
1177 [10] |
1178 $ hg fix -r '.^' |
1178 $ hg fix -r '.^' |
1179 1 new orphan changesets |
1179 1 new orphan changesets |
1180 $ hg cat -r 2 foo.whole |
1180 $ hg cat -r 2 foo.whole |
1181 ONE |
1181 ONE |
1182 |
1182 |