equal
deleted
inserted
replaced
1222 | | |
1222 | | |
1223 o | 19:24e63b319adf@default(draft) add gg |
1223 o | 19:24e63b319adf@default(draft) add gg |
1224 |/ |
1224 |/ |
1225 o 18:edc3c9de504e@default(draft) a3 |
1225 o 18:edc3c9de504e@default(draft) a3 |
1226 | |
1226 | |
|
1227 ~ |
1227 |
1228 |
1228 $ hg evolve --rev 23 --any |
1229 $ hg evolve --rev 23 --any |
1229 abort: cannot specify both "--rev" and "--any" |
1230 abort: cannot specify both "--rev" and "--any" |
1230 [255] |
1231 [255] |
1231 $ hg evolve --rev 23 |
1232 $ hg evolve --rev 23 |
1260 | | |
1261 | | |
1261 o | 19:24e63b319adf@default(draft) add gg |
1262 o | 19:24e63b319adf@default(draft) add gg |
1262 |/ |
1263 |/ |
1263 o 18:edc3c9de504e@default(draft) a3 |
1264 o 18:edc3c9de504e@default(draft) a3 |
1264 | |
1265 | |
|
1266 ~ |
1265 |
1267 |
1266 Check that prune respects the allowunstable option |
1268 Check that prune respects the allowunstable option |
1267 $ hg up -C . |
1269 $ hg up -C . |
1268 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1270 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1269 $ hg up 20 |
1271 $ hg up 20 |
1289 | | |
1291 | | |
1290 o | 19:24e63b319adf@default(draft) add gg |
1292 o | 19:24e63b319adf@default(draft) add gg |
1291 |/ |
1293 |/ |
1292 o 18:edc3c9de504e@default(draft) a3 |
1294 o 18:edc3c9de504e@default(draft) a3 |
1293 | |
1295 | |
|
1296 ~ |
1294 $ hg up 19 |
1297 $ hg up 19 |
1295 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1298 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1296 $ mkcommit c5_ |
1299 $ mkcommit c5_ |
1297 created new head |
1300 created new head |
1298 $ hg prune '26 + 27' |
1301 $ hg prune '26 + 27' |
1310 | | |
1313 | | |
1311 o | 19:24e63b319adf@default(draft) add gg |
1314 o | 19:24e63b319adf@default(draft) add gg |
1312 |/ |
1315 |/ |
1313 o 18:edc3c9de504e@default(draft) a3 |
1316 o 18:edc3c9de504e@default(draft) a3 |
1314 | |
1317 | |
|
1318 ~ |
1315 |
1319 |
1316 Check that fold respects the allowunstable option |
1320 Check that fold respects the allowunstable option |
1317 $ hg up edc3c9de504e |
1321 $ hg up edc3c9de504e |
1318 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1322 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1319 $ mkcommit unstableifparentisfolded |
1323 $ mkcommit unstableifparentisfolded |
1327 | | |
1331 | | |
1328 | o 19:24e63b319adf@default(draft) add gg |
1332 | o 19:24e63b319adf@default(draft) add gg |
1329 |/ |
1333 |/ |
1330 o 18:edc3c9de504e@default(draft) a3 |
1334 o 18:edc3c9de504e@default(draft) a3 |
1331 | |
1335 | |
|
1336 ~ |
1332 |
1337 |
1333 $ hg fold --exact "19 + 18" |
1338 $ hg fold --exact "19 + 18" |
1334 abort: cannot fold chain not ending with a head or with branching |
1339 abort: cannot fold chain not ending with a head or with branching |
1335 [255] |
1340 [255] |
1336 $ hg fold --exact "18::29" |
1341 $ hg fold --exact "18::29" |
1354 |/ |
1359 |/ |
1355 | o 20:e02107f98737@default(draft) add gh |
1360 | o 20:e02107f98737@default(draft) add gh |
1356 |/ |
1361 |/ |
1357 o 18:edc3c9de504e@default(draft) a3 |
1362 o 18:edc3c9de504e@default(draft) a3 |
1358 | |
1363 | |
|
1364 ~ |
1359 |
1365 |
1360 Create a split commit |
1366 Create a split commit |
1361 $ printf "oo" > oo; |
1367 $ printf "oo" > oo; |
1362 $ printf "pp" > pp; |
1368 $ printf "pp" > pp; |
1363 $ hg add oo pp |
1369 $ hg add oo pp |
1390 |/ |
1396 |/ |
1391 | o 20:e02107f98737@default(draft) add gh |
1397 | o 20:e02107f98737@default(draft) add gh |
1392 |/ |
1398 |/ |
1393 o 18:edc3c9de504e@default(draft) a3 |
1399 o 18:edc3c9de504e@default(draft) a3 |
1394 | |
1400 | |
|
1401 ~ |
1395 $ hg evolve --rev "18::" |
1402 $ hg evolve --rev "18::" |
1396 move:[33] add uu |
1403 move:[33] add uu |
1397 atop:[35] _pp |
1404 atop:[35] _pp |
1398 working directory is now at 43c3f5ef149f |
1405 working directory is now at 43c3f5ef149f |
1399 |
1406 |
1444 | |/ |
1451 | |/ |
1445 | x 37:36030b147271@default(draft) will be amended |
1452 | x 37:36030b147271@default(draft) will be amended |
1446 |/ |
1453 |/ |
1447 o 36:43c3f5ef149f@default(draft) add uu |
1454 o 36:43c3f5ef149f@default(draft) add uu |
1448 | |
1455 | |
|
1456 ~ |
1449 |
1457 |
1450 $ hg status newlyadded |
1458 $ hg status newlyadded |
1451 A newlyadded |
1459 A newlyadded |