equal
deleted
inserted
replaced
1237 > evolution=createmarkers, allnewcommands |
1237 > evolution=createmarkers, allnewcommands |
1238 > EOF |
1238 > EOF |
1239 $ hg up 274b6cd0c101^ |
1239 $ hg up 274b6cd0c101^ |
1240 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1240 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1241 $ hg uncommit --all |
1241 $ hg uncommit --all |
1242 abort: uncommit will orphan 4 descendants |
1242 abort: performing 'uncommit' in the middle of a stack will orphan 0fd8bfb02de4 and its 3 descendants |
1243 (see 'hg help evolution.instability') |
1243 (see 'hg help evolution.instability') |
1244 [255] |
1244 [255] |
1245 $ hg up 274b6cd0c101 |
1245 $ hg up 274b6cd0c101 |
1246 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1246 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1247 $ hg uncommit --all |
1247 $ hg uncommit --all |
1294 $ hg up 98e171e2f272 |
1294 $ hg up 98e171e2f272 |
1295 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1295 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1296 $ mkcommit c5_ |
1296 $ mkcommit c5_ |
1297 created new head |
1297 created new head |
1298 $ hg prune '0ef9ff75f8e2 + f1b85956c48c' |
1298 $ hg prune '0ef9ff75f8e2 + f1b85956c48c' |
1299 abort: prune will orphan 1 descendants |
1299 abort: performing 'prune' in the middle of a stack will orphan 0d9203b74542 |
1300 (see 'hg help evolution.instability') |
1300 (see 'hg help evolution.instability') |
1301 [255] |
1301 [255] |
1302 $ hg prune '98e171e2f272::0d9203b74542' |
1302 $ hg prune '98e171e2f272::0d9203b74542' |
1303 abort: prune will orphan 1 descendants |
1303 abort: performing 'prune' in the middle of a stack will orphan 4c6f6f6d1976 |
1304 (see 'hg help evolution.instability') |
1304 (see 'hg help evolution.instability') |
1305 [255] |
1305 [255] |
1306 $ hg prune '0ef9ff75f8e2::' |
1306 $ hg prune '0ef9ff75f8e2::' |
1307 3 changesets pruned |
1307 3 changesets pruned |
1308 $ glog -r "0cf3707e8971::" |
1308 $ glog -r "0cf3707e8971::" |