equal
deleted
inserted
replaced
269 of the original obsolete parent. When obsolesence is off, we're just fixing and |
269 of the original obsolete parent. When obsolesence is off, we're just fixing and |
270 replacing anything that isn't public. |
270 replacing anything that isn't public. |
271 |
271 |
272 $ hg init fixall |
272 $ hg init fixall |
273 $ cd fixall |
273 $ cd fixall |
|
274 $ hg fix --all --working-dir |
|
275 abort: cannot specify both --working-dir and --all |
|
276 [255] |
274 |
277 |
275 #if obsstore-on |
278 #if obsstore-on |
276 $ printf "one\n" > foo.whole |
279 $ printf "one\n" > foo.whole |
277 $ hg commit -Aqm "first" |
280 $ hg commit -Aqm "first" |
278 $ hg phase --public |
281 $ hg phase --public |