equal
deleted
inserted
replaced
457 $ hg graft --continue |
457 $ hg graft --continue |
458 abort: no graft in progress |
458 abort: no graft in progress |
459 (continue: hg unshelve --continue) |
459 (continue: hg unshelve --continue) |
460 [255] |
460 [255] |
461 $ hg unshelve -c |
461 $ hg unshelve -c |
462 rebasing 5:32c69314e062 "changes to: [mq]: second.patch" (tip) |
|
463 unshelve of 'default' complete |
462 unshelve of 'default' complete |
464 |
463 |
465 ensure the repo is as we hope |
464 ensure the repo is as we hope |
466 |
465 |
467 $ hg parents |
466 $ hg parents |
899 reverting a/a |
898 reverting a/a |
900 $ hg resolve -m a/a |
899 $ hg resolve -m a/a |
901 (no more unresolved files) |
900 (no more unresolved files) |
902 continue: hg unshelve --continue |
901 continue: hg unshelve --continue |
903 $ hg unshelve -c |
902 $ hg unshelve -c |
904 rebasing 5:e42a7da90865 "changes to: second" (tip) |
903 note: unshelved changes already existed in the working copy |
905 note: rebase of 5:e42a7da90865 created no changes to commit |
|
906 unshelve of 'default' complete |
904 unshelve of 'default' complete |
907 $ hg bookmark |
905 $ hg bookmark |
908 * test 4:33f7f61e6c5e |
906 * test 4:33f7f61e6c5e |
909 $ hg diff |
907 $ hg diff |
910 $ hg status |
908 $ hg status |
1532 $ rm a.orig |
1530 $ rm a.orig |
1533 $ hg resolve --mark a |
1531 $ hg resolve --mark a |
1534 (no more unresolved files) |
1532 (no more unresolved files) |
1535 continue: hg unshelve --continue |
1533 continue: hg unshelve --continue |
1536 $ hg unshelve --continue |
1534 $ hg unshelve --continue |
1537 rebasing 2:425c97ef07f3 "changes to: a" (tip) |
|
1538 marked working directory as branch test |
1535 marked working directory as branch test |
1539 unshelve of 'default' complete |
1536 unshelve of 'default' complete |
1540 $ cat a |
1537 $ cat a |
1541 aaabbbccc |
1538 aaabbbccc |
1542 $ hg status |
1539 $ hg status |
1616 $ rm a.orig |
1613 $ rm a.orig |
1617 $ hg resolve --mark a |
1614 $ hg resolve --mark a |
1618 (no more unresolved files) |
1615 (no more unresolved files) |
1619 continue: hg unshelve --continue |
1616 continue: hg unshelve --continue |
1620 $ hg unshelve --continue |
1617 $ hg unshelve --continue |
1621 rebasing 2:425c97ef07f3 "changes to: a" (tip) |
|
1622 unshelve of 'default' complete |
1618 unshelve of 'default' complete |
1623 $ cat a |
1619 $ cat a |
1624 aaabbbccc |
1620 aaabbbccc |
1625 $ hg status |
1621 $ hg status |
1626 M a |
1622 M a |
1720 [1] |
1716 [1] |
1721 $ hg resolve --mark file |
1717 $ hg resolve --mark file |
1722 (no more unresolved files) |
1718 (no more unresolved files) |
1723 continue: hg unshelve --continue |
1719 continue: hg unshelve --continue |
1724 $ hg unshelve --continue |
1720 $ hg unshelve --continue |
1725 rebasing 2:3fbe6fbb0bef "changes to: 1" (tip) |
|
1726 unshelve of 'default' complete |
1721 unshelve of 'default' complete |
1727 $ hg shelve --list |
1722 $ hg shelve --list |
1728 default (*s ago) * changes to: 1 (glob) |
1723 default (*s ago) * changes to: 1 (glob) |
1729 $ cd .. |
1724 $ cd .. |
1730 |
1725 |
1793 $ hg resolve --mark a |
1788 $ hg resolve --mark a |
1794 (no more unresolved files) |
1789 (no more unresolved files) |
1795 continue: hg unshelve --continue |
1790 continue: hg unshelve --continue |
1796 mercurial does not crash |
1791 mercurial does not crash |
1797 $ hg unshelve --continue |
1792 $ hg unshelve --continue |
1798 rebasing 2:003d2d94241c "changes to: root" (tip) |
|
1799 unshelve of 'ashelve' complete |
1793 unshelve of 'ashelve' complete |
1800 $ cd .. |
1794 $ cd .. |
1801 |
1795 |