1466 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1466 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1467 $ rm newlyadded |
1467 $ rm newlyadded |
1468 $ hg metaedit -r 0 |
1468 $ hg metaedit -r 0 |
1469 abort: cannot edit commit information for public revisions |
1469 abort: cannot edit commit information for public revisions |
1470 [255] |
1470 [255] |
|
1471 $ hg metaedit --fold |
|
1472 abort: revisions must be specified with --fold |
|
1473 [255] |
|
1474 $ hg metaedit -r 0 --fold |
|
1475 abort: cannot fold public revisions |
|
1476 [255] |
|
1477 $ hg metaedit '36 + 42' --fold |
|
1478 abort: cannot fold non-linear revisions (multiple roots given) |
|
1479 [255] |
|
1480 $ hg metaedit '36::39 + 41' --fold |
|
1481 abort: cannot fold non-linear revisions (multiple heads given) |
|
1482 [255] |
1471 check that metaedit respects allowunstable |
1483 check that metaedit respects allowunstable |
1472 $ hg metaedit '.^' --config 'experimental.evolution=createmarkers, allnewcommands' |
1484 $ hg metaedit '.^' --config 'experimental.evolution=createmarkers, allnewcommands' |
1473 abort: cannot edit commit information in the middle of a stack |
1485 abort: cannot edit commit information in the middle of a stack |
1474 (c904da5245b0 will be affected) |
1486 (c904da5245b0 will be affected) |
|
1487 [255] |
|
1488 $ hg metaedit '18::20' --fold --config 'experimental.evolution=createmarkers, allnewcommands' |
|
1489 abort: cannot fold chain not ending with a head or with branching |
1475 [255] |
1490 [255] |
1476 $ hg metaedit --user foobar |
1491 $ hg metaedit --user foobar |
1477 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1492 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1478 $ hg log --template '{rev}: {author}\n' -r '42:' --hidden |
1493 $ hg log --template '{rev}: {author}\n' -r '42:' --hidden |
1479 42: test |
1494 42: test |
1481 $ hg log --template '{rev}: {author}\n' -r . |
1496 $ hg log --template '{rev}: {author}\n' -r . |
1482 43: foobar |
1497 43: foobar |
1483 |
1498 |
1484 TODO: support this |
1499 TODO: support this |
1485 $ hg metaedit '.^::.' |
1500 $ hg metaedit '.^::.' |
1486 abort: editing multiple revisions is not currently supported |
1501 abort: editing multiple revisions without --fold is not currently supported |
1487 [255] |
1502 [255] |
1488 |
1503 |
1489 no new commit is created here because the date is the same |
1504 $ HGEDITOR=cat hg metaedit '.^::.' --fold |
1490 $ HGEDITOR=cat hg metaedit |
1505 HG: This is a fold of 2 changesets. |
|
1506 HG: Commit message of changeset 41. |
|
1507 |
|
1508 amended |
|
1509 |
|
1510 HG: Commit message of changeset 43. |
|
1511 |
1491 will be evolved safely |
1512 will be evolved safely |
|
1513 |
1492 |
1514 |
1493 |
1515 |
1494 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
1516 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
1495 HG: Leave message empty to abort commit. |
1517 HG: Leave message empty to abort commit. |
1496 HG: -- |
1518 HG: -- |
1497 HG: user: foobar |
1519 HG: user: test |
1498 HG: branch 'default' |
1520 HG: branch 'default' |
1499 HG: changed a |
1521 HG: changed a |
|
1522 HG: changed newfile |
|
1523 2 changesets folded |
|
1524 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1525 |
|
1526 $ glog -r . |
|
1527 @ 44:41bf1183869c@default(draft) amended |
|
1528 | |
|
1529 ~ |
|
1530 |
|
1531 no new commit is created here because the date is the same |
|
1532 $ HGEDITOR=cat hg metaedit |
|
1533 amended |
|
1534 |
|
1535 |
|
1536 will be evolved safely |
|
1537 |
|
1538 |
|
1539 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
1540 HG: Leave message empty to abort commit. |
|
1541 HG: -- |
|
1542 HG: user: test |
|
1543 HG: branch 'default' |
|
1544 HG: changed a |
|
1545 HG: changed newfile |
1500 nothing changed |
1546 nothing changed |
1501 |
1547 |
1502 $ glog -r '.^::.' |
1548 $ glog -r '.^::.' |
1503 @ 43:62353add3dfb@default(draft) will be evolved safely |
1549 @ 44:41bf1183869c@default(draft) amended |
1504 | |
1550 | |
1505 o 41:34ae045ec400@default(draft) amended |
1551 o 36:43c3f5ef149f@default(draft) add uu |
1506 | |
1552 | |
1507 ~ |
1553 ~ |
1508 |
1554 |
1509 TODO: don't create a new commit in this case |
1555 TODO: don't create a new commit in this case |
1510 $ hg metaedit --config defaults.metaedit= |
1556 $ hg metaedit --config defaults.metaedit= |
1511 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1557 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1512 $ hg log -r '.^::.' --template '{rev}: {desc|firstline}\n' |
1558 $ hg log -r '.^::.' --template '{rev}: {desc|firstline}\n' |
1513 41: amended |
1559 36: add uu |
1514 44: will be evolved safely |
1560 45: amended |
1515 |
1561 |
1516 $ hg up .^ |
1562 $ hg up .^ |
1517 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1563 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1518 $ hg metaedit --user foobar2 44 |
1564 $ hg metaedit --user foobar2 45 |
1519 $ hg log --template '{rev}: {author}\n' -r '42:' --hidden |
1565 $ hg log --template '{rev}: {author}\n' -r '42:' --hidden |
1520 42: test |
1566 42: test |
1521 43: foobar |
1567 43: foobar |
1522 44: foobar |
1568 44: test |
1523 45: foobar2 |
1569 45: test |
1524 $ hg diff -r 44 -r 45 --hidden |
1570 46: foobar2 |
|
1571 $ hg diff -r 45 -r 46 --hidden |
|
1572 |
|
1573 'fold' one commit |
|
1574 $ hg metaedit 39 --fold --user foobar3 |
|
1575 1 changesets folded |
|
1576 $ hg log -r 47 --template '{rev}: {author}\n' |
|
1577 47: foobar3 |