Show More
@@ -1383,6 +1383,7 b' We expect that bare-shelve will not keep' | |||||
1383 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1383 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1384 | $ hg branch |
|
1384 | $ hg branch | |
1385 | default |
|
1385 | default | |
|
1386 | $ cd .. | |||
1386 |
|
1387 | |||
1387 | When i shelve commit on newly created branch i expect |
|
1388 | When i shelve commit on newly created branch i expect | |
1388 | that after unshelve newly created branch will be preserved. |
|
1389 | that after unshelve newly created branch will be preserved. | |
@@ -1416,6 +1417,7 b' that after unshelve newly created branch' | |||||
1416 | ? b |
|
1417 | ? b | |
1417 | $ hg branch |
|
1418 | $ hg branch | |
1418 | test |
|
1419 | test | |
|
1420 | $ cd .. | |||
1419 |
|
1421 | |||
1420 | When i shelve commit on newly created branch, make |
|
1422 | When i shelve commit on newly created branch, make | |
1421 | some changes, unshelve it and running into merge |
|
1423 | some changes, unshelve it and running into merge | |
@@ -1489,6 +1491,7 b' test branch.' | |||||
1489 | A b |
|
1491 | A b | |
1490 | $ hg branch |
|
1492 | $ hg branch | |
1491 | default |
|
1493 | default | |
|
1494 | $ cd .. | |||
1492 |
|
1495 | |||
1493 | When i unshelve resulting in merge conflicts and makes saved |
|
1496 | When i unshelve resulting in merge conflicts and makes saved | |
1494 | file shelvedstate looks like in previous versions in |
|
1497 | file shelvedstate looks like in previous versions in | |
@@ -1551,6 +1554,7 b' in previous versions) and running unshel' | |||||
1551 | M a |
|
1554 | M a | |
1552 | $ hg branch |
|
1555 | $ hg branch | |
1553 | default |
|
1556 | default | |
|
1557 | $ cd .. | |||
1554 |
|
1558 | |||
1555 | On non bare shelve the branch information shouldn't be restored |
|
1559 | On non bare shelve the branch information shouldn't be restored | |
1556 |
|
1560 | |||
@@ -1624,7 +1628,7 b' progress' | |||||
1624 | $ cd .. |
|
1628 | $ cd .. | |
1625 |
|
1629 | |||
1626 | Unshelve respects --keep even if user intervention is needed |
|
1630 | Unshelve respects --keep even if user intervention is needed | |
1627 | $ hg init unshelvekeep |
|
1631 | $ hg init unshelvekeep && cd unshelvekeep | |
1628 | $ echo 1 > file && hg ci -Am 1 |
|
1632 | $ echo 1 > file && hg ci -Am 1 | |
1629 | adding file |
|
1633 | adding file | |
1630 | $ echo 2 >> file |
|
1634 | $ echo 2 >> file | |
@@ -1637,7 +1641,7 b' Unshelve respects --keep even if user in' | |||||
1637 | $ hg unshelve --keep |
|
1641 | $ hg unshelve --keep | |
1638 | unshelving change 'default' |
|
1642 | unshelving change 'default' | |
1639 | rebasing shelved changes |
|
1643 | rebasing shelved changes | |
1640 |
rebasing |
|
1644 | rebasing 2:3fbe6fbb0bef "changes to: 1" (tip) | |
1641 | merging file |
|
1645 | merging file | |
1642 | warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
|
1646 | warning: conflicts while merging file! (edit, then use 'hg resolve --mark') | |
1643 | unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
|
1647 | unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') | |
@@ -1646,7 +1650,8 b' Unshelve respects --keep even if user in' | |||||
1646 | (no more unresolved files) |
|
1650 | (no more unresolved files) | |
1647 | continue: hg unshelve --continue |
|
1651 | continue: hg unshelve --continue | |
1648 | $ hg unshelve --continue |
|
1652 | $ hg unshelve --continue | |
1649 |
rebasing |
|
1653 | rebasing 2:3fbe6fbb0bef "changes to: 1" (tip) | |
1650 | unshelve of 'default' complete |
|
1654 | unshelve of 'default' complete | |
1651 | $ hg shelve --list |
|
1655 | $ hg shelve --list | |
1652 |
default ( |
|
1656 | default (*s ago) changes to: 1 (glob) | |
|
1657 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now