1563 o 10:ec7eda2313e2 added b |
1563 o 10:ec7eda2313e2 added b |
1564 | (grafted from 80e6d2c47cfe5b3185519568327a17a061c7efb6) |
1564 | (grafted from 80e6d2c47cfe5b3185519568327a17a061c7efb6) |
1565 o 3:9e887f7a939c bar to b |
1565 o 3:9e887f7a939c bar to b |
1566 | |
1566 | |
1567 ~ |
1567 ~ |
|
1568 |
|
1569 $ cd .. |
|
1570 |
|
1571 Testing the --stop flag of `hg graft` which stops the interrupted graft |
|
1572 |
|
1573 $ hg init stopgraft |
|
1574 $ cd stopgraft |
|
1575 $ for ch in a b c d; do echo $ch > $ch; hg add $ch; hg ci -Aqm "added "$ch; done; |
|
1576 |
|
1577 $ hg log -G |
|
1578 @ changeset: 3:9150fe93bec6 |
|
1579 | tag: tip |
|
1580 | user: test |
|
1581 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1582 | summary: added d |
|
1583 | |
|
1584 o changeset: 2:155349b645be |
|
1585 | user: test |
|
1586 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1587 | summary: added c |
|
1588 | |
|
1589 o changeset: 1:5f6d8a4bf34a |
|
1590 | user: test |
|
1591 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1592 | summary: added b |
|
1593 | |
|
1594 o changeset: 0:9092f1db7931 |
|
1595 user: test |
|
1596 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1597 summary: added a |
|
1598 |
|
1599 $ hg up '.^^' |
|
1600 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1601 |
|
1602 $ echo foo > d |
|
1603 $ hg ci -Aqm "added foo to d" |
|
1604 |
|
1605 $ hg graft --stop |
|
1606 abort: no interrupted graft found |
|
1607 [255] |
|
1608 |
|
1609 $ hg graft -r 3 |
|
1610 grafting 3:9150fe93bec6 "added d" |
|
1611 merging d |
|
1612 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
|
1613 abort: unresolved conflicts, can't continue |
|
1614 (use 'hg resolve' and 'hg graft --continue') |
|
1615 [255] |
|
1616 |
|
1617 $ hg graft --stop --continue |
|
1618 abort: cannot use '--continue' and '--stop' together |
|
1619 [255] |
|
1620 |
|
1621 $ hg graft --stop -U |
|
1622 abort: cannot specify any other flag with '--stop' |
|
1623 [255] |
|
1624 $ hg graft --stop --rev 4 |
|
1625 abort: cannot specify any other flag with '--stop' |
|
1626 [255] |
|
1627 $ hg graft --stop --log |
|
1628 abort: cannot specify any other flag with '--stop' |
|
1629 [255] |
|
1630 |
|
1631 $ hg graft --stop |
|
1632 stopped the interrupted graft |
|
1633 working directory is now at a0deacecd59d |
|
1634 |
|
1635 $ hg diff |
|
1636 |
|
1637 $ hg log -Gr '.' |
|
1638 @ changeset: 4:a0deacecd59d |
|
1639 | tag: tip |
|
1640 ~ parent: 1:5f6d8a4bf34a |
|
1641 user: test |
|
1642 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1643 summary: added foo to d |
|
1644 |
|
1645 $ hg graft -r 2 -r 3 |
|
1646 grafting 2:155349b645be "added c" |
|
1647 grafting 3:9150fe93bec6 "added d" |
|
1648 merging d |
|
1649 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
|
1650 abort: unresolved conflicts, can't continue |
|
1651 (use 'hg resolve' and 'hg graft --continue') |
|
1652 [255] |
|
1653 |
|
1654 $ hg graft --stop |
|
1655 stopped the interrupted graft |
|
1656 working directory is now at 75b447541a9e |
|
1657 |
|
1658 $ hg diff |
|
1659 |
|
1660 $ hg log -G -T "{rev}:{node|short} {desc}" |
|
1661 @ 5:75b447541a9e added c |
|
1662 | |
|
1663 o 4:a0deacecd59d added foo to d |
|
1664 | |
|
1665 | o 3:9150fe93bec6 added d |
|
1666 | | |
|
1667 | o 2:155349b645be added c |
|
1668 |/ |
|
1669 o 1:5f6d8a4bf34a added b |
|
1670 | |
|
1671 o 0:9092f1db7931 added a |
|
1672 |