equal
deleted
inserted
replaced
1171 $ hg commit -Aqm "first" |
1171 $ hg commit -Aqm "first" |
1172 $ printf "two\n" > foo.whole |
1172 $ printf "two\n" > foo.whole |
1173 $ hg commit -m "second" |
1173 $ hg commit -m "second" |
1174 $ hg --config experimental.evolution.allowunstable=False fix -r '.^' |
1174 $ hg --config experimental.evolution.allowunstable=False fix -r '.^' |
1175 abort: cannot fix changeset with children |
1175 abort: cannot fix changeset with children |
|
1176 (see 'hg help evolution.instability') |
1176 [10] |
1177 [10] |
1177 $ hg fix -r '.^' |
1178 $ hg fix -r '.^' |
1178 1 new orphan changesets |
1179 1 new orphan changesets |
1179 $ hg cat -r 2 foo.whole |
1180 $ hg cat -r 2 foo.whole |
1180 ONE |
1181 ONE |