equal
deleted
inserted
replaced
593 $ hg graft -O 7 |
593 $ hg graft -O 7 |
594 grafting 7:a5bfd90a2f29 "conflict" (tip) |
594 grafting 7:a5bfd90a2f29 "conflict" (tip) |
595 merging 1 |
595 merging 1 |
596 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') |
596 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') |
597 abort: unresolved conflicts, can't continue |
597 abort: unresolved conflicts, can't continue |
598 (use 'hg resolve' and 'hg graft --continue') |
598 (use hg resolve and hg graft --continue) |
599 [255] |
599 [255] |
600 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
600 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
601 7:a5bfd90a2f29 |
601 7:a5bfd90a2f29 |
602 $ echo 3 > 1 |
602 $ echo 3 > 1 |
603 $ hg resolve -m 1 |
603 $ hg resolve -m 1 |
1236 | | |
1236 | | |
1237 o | 19:24e63b319adf@default(draft) add gg |
1237 o | 19:24e63b319adf@default(draft) add gg |
1238 |/ |
1238 |/ |
1239 o 18:edc3c9de504e@default(draft) a3 |
1239 o 18:edc3c9de504e@default(draft) a3 |
1240 | |
1240 | |
1241 ~ |
|
1242 |
1241 |
1243 $ hg evolve --rev 23 --any |
1242 $ hg evolve --rev 23 --any |
1244 abort: cannot specify both "--rev" and "--any" |
1243 abort: cannot specify both "--rev" and "--any" |
1245 [255] |
1244 [255] |
1246 $ hg evolve --rev 23 |
1245 $ hg evolve --rev 23 |
1275 | | |
1274 | | |
1276 o | 19:24e63b319adf@default(draft) add gg |
1275 o | 19:24e63b319adf@default(draft) add gg |
1277 |/ |
1276 |/ |
1278 o 18:edc3c9de504e@default(draft) a3 |
1277 o 18:edc3c9de504e@default(draft) a3 |
1279 | |
1278 | |
1280 ~ |
|
1281 |
1279 |
1282 Check that prune respects the allowunstable option |
1280 Check that prune respects the allowunstable option |
1283 $ hg up -C . |
1281 $ hg up -C . |
1284 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1282 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1285 $ hg up 20 |
1283 $ hg up 20 |
1305 | | |
1303 | | |
1306 o | 19:24e63b319adf@default(draft) add gg |
1304 o | 19:24e63b319adf@default(draft) add gg |
1307 |/ |
1305 |/ |
1308 o 18:edc3c9de504e@default(draft) a3 |
1306 o 18:edc3c9de504e@default(draft) a3 |
1309 | |
1307 | |
1310 ~ |
|
1311 $ hg up 19 |
1308 $ hg up 19 |
1312 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1309 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1313 $ mkcommit c5_ |
1310 $ mkcommit c5_ |
1314 created new head |
1311 created new head |
1315 $ hg prune '26 + 27' |
1312 $ hg prune '26 + 27' |
1329 | | |
1326 | | |
1330 o | 19:24e63b319adf@default(draft) add gg |
1327 o | 19:24e63b319adf@default(draft) add gg |
1331 |/ |
1328 |/ |
1332 o 18:edc3c9de504e@default(draft) a3 |
1329 o 18:edc3c9de504e@default(draft) a3 |
1333 | |
1330 | |
1334 ~ |
|
1335 |
1331 |
1336 Check that fold respects the allowunstable option |
1332 Check that fold respects the allowunstable option |
1337 $ hg up edc3c9de504e |
1333 $ hg up edc3c9de504e |
1338 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1334 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1339 $ mkcommit unstableifparentisfolded |
1335 $ mkcommit unstableifparentisfolded |
1347 | | |
1343 | | |
1348 | o 19:24e63b319adf@default(draft) add gg |
1344 | o 19:24e63b319adf@default(draft) add gg |
1349 |/ |
1345 |/ |
1350 o 18:edc3c9de504e@default(draft) a3 |
1346 o 18:edc3c9de504e@default(draft) a3 |
1351 | |
1347 | |
1352 ~ |
|
1353 |
1348 |
1354 $ hg fold --exact "19 + 18" |
1349 $ hg fold --exact "19 + 18" |
1355 abort: cannot fold chain not ending with a head or with branching |
1350 abort: cannot fold chain not ending with a head or with branching |
1356 (new unstable changesets are not allowed) |
1351 (new unstable changesets are not allowed) |
1357 [255] |
1352 [255] |
1377 |/ |
1372 |/ |
1378 | o 20:e02107f98737@default(draft) add gh |
1373 | o 20:e02107f98737@default(draft) add gh |
1379 |/ |
1374 |/ |
1380 o 18:edc3c9de504e@default(draft) a3 |
1375 o 18:edc3c9de504e@default(draft) a3 |
1381 | |
1376 | |
1382 ~ |
|
1383 |
1377 |
1384 Create a split commit |
1378 Create a split commit |
1385 $ printf "oo" > oo; |
1379 $ printf "oo" > oo; |
1386 $ printf "pp" > pp; |
1380 $ printf "pp" > pp; |
1387 $ hg add oo pp |
1381 $ hg add oo pp |
1414 |/ |
1408 |/ |
1415 | o 20:e02107f98737@default(draft) add gh |
1409 | o 20:e02107f98737@default(draft) add gh |
1416 |/ |
1410 |/ |
1417 o 18:edc3c9de504e@default(draft) a3 |
1411 o 18:edc3c9de504e@default(draft) a3 |
1418 | |
1412 | |
1419 ~ |
|
1420 $ hg evolve --rev "18::" |
1413 $ hg evolve --rev "18::" |
1421 move:[33] add uu |
1414 move:[33] add uu |
1422 atop:[35] _pp |
1415 atop:[35] _pp |
1423 working directory is now at 43c3f5ef149f |
1416 working directory is now at 43c3f5ef149f |
1424 |
1417 |
1469 | |/ |
1462 | |/ |
1470 | x 37:36030b147271@default(draft) will be amended |
1463 | x 37:36030b147271@default(draft) will be amended |
1471 |/ |
1464 |/ |
1472 o 36:43c3f5ef149f@default(draft) add uu |
1465 o 36:43c3f5ef149f@default(draft) add uu |
1473 | |
1466 | |
1474 ~ |
|
1475 |
1467 |
1476 $ hg status newlyadded |
1468 $ hg status newlyadded |
1477 A newlyadded |
1469 A newlyadded |
1478 |
1470 |
1479 hg metaedit |
1471 hg metaedit |
1542 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1534 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1543 |
1535 |
1544 $ glog -r . |
1536 $ glog -r . |
1545 @ 44:41bf1183869c@default(draft) amended |
1537 @ 44:41bf1183869c@default(draft) amended |
1546 | |
1538 | |
1547 ~ |
|
1548 |
1539 |
1549 no new commit is created here because the date is the same |
1540 no new commit is created here because the date is the same |
1550 $ HGEDITOR=cat hg metaedit |
1541 $ HGEDITOR=cat hg metaedit |
1551 amended |
1542 amended |
1552 |
1543 |
1566 $ glog -r '.^::.' |
1557 $ glog -r '.^::.' |
1567 @ 44:41bf1183869c@default(draft) amended |
1558 @ 44:41bf1183869c@default(draft) amended |
1568 | |
1559 | |
1569 o 36:43c3f5ef149f@default(draft) add uu |
1560 o 36:43c3f5ef149f@default(draft) add uu |
1570 | |
1561 | |
1571 ~ |
|
1572 |
1562 |
1573 TODO: don't create a new commit in this case |
1563 TODO: don't create a new commit in this case |
1574 $ hg metaedit --config defaults.metaedit= |
1564 $ hg metaedit --config defaults.metaedit= |
1575 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1565 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1576 $ hg log -r '.^::.' --template '{rev}: {desc|firstline}\n' |
1566 $ hg log -r '.^::.' --template '{rev}: {desc|firstline}\n' |