Mercurial > hg
comparison tests/test-fix.t @ 43936:699d6be3820a
fix: use rewriteutil.precheck() instead of reimplementing it
Differential Revision: https://phab.mercurial-scm.org/D7687
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 17 Dec 2019 10:55:50 -0800 |
parents | f02d3c0eed18 |
children | 9595b6a9f0d5 |
comparison
equal
deleted
inserted
replaced
43935:2349a60f33db | 43936:699d6be3820a |
---|---|
262 | 262 |
263 $ printf "hello\n" > hello.whole | 263 $ printf "hello\n" > hello.whole |
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: can't fix immutable changeset 0:6470986d2e7b | 267 abort: cannot fix public changesets |
268 (see 'hg help phases' for details) | |
268 [255] | 269 [255] |
269 $ hg fix -r 0 --working-dir | 270 $ hg fix -r 0 --working-dir |
270 abort: can't fix immutable changeset 0:6470986d2e7b | 271 abort: cannot fix public changesets |
272 (see 'hg help phases' for details) | |
271 [255] | 273 [255] |
272 $ hg cat -r tip hello.whole | 274 $ hg cat -r tip hello.whole |
273 hello | 275 hello |
274 $ cat hello.whole | 276 $ cat hello.whole |
275 hello | 277 hello |
1169 $ printf "one\n" > foo.whole | 1171 $ printf "one\n" > foo.whole |
1170 $ hg commit -Aqm "first" | 1172 $ hg commit -Aqm "first" |
1171 $ printf "two\n" > foo.whole | 1173 $ printf "two\n" > foo.whole |
1172 $ hg commit -m "second" | 1174 $ hg commit -m "second" |
1173 $ hg --config experimental.evolution.allowunstable=False fix -r '.^' | 1175 $ hg --config experimental.evolution.allowunstable=False fix -r '.^' |
1174 abort: can only fix a changeset together with all its descendants | 1176 abort: cannot fix changeset with children |
1175 [255] | 1177 [255] |
1176 $ hg fix -r '.^' | 1178 $ hg fix -r '.^' |
1177 1 new orphan changesets | 1179 1 new orphan changesets |
1178 $ hg cat -r 2 foo.whole | 1180 $ hg cat -r 2 foo.whole |
1179 ONE | 1181 ONE |