1381   $ hg shelve

  1381   $ hg shelve

  1382   shelved as default-03

  1382   shelved as default-03

  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 

  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.

  1389 

  1390 

  1390   $ hg init shelve_on_new_branch_simple

  1391   $ hg init shelve_on_new_branch_simple

  1414   $ hg status

  1415   $ hg status

  1415   M a

  1416   M a

  1416   ? b

  1417   ? b

  1417   $ hg branch

  1418   $ hg branch

  1418   test

  1419   test

  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

  1422 conflicts i expect that after fixing them and

  1424 conflicts i expect that after fixing them and

  1423 running unshelve --continue newly created branch

  1425 running unshelve --continue newly created branch

  1487   rebasing 2:357525f34729 "changes to: test-commit" (tip)

  1489   rebasing 2:357525f34729 "changes to: test-commit" (tip)

  1488   $ hg status

  1490   $ hg status

  1489   A b

  1491   A b

  1490   $ hg branch

  1492   $ hg branch

  1491   default

  1493   default

  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

  1495 mercurial(without restore branch information in 7th line) i

  1498 mercurial(without restore branch information in 7th line) i

  1496 expect that after resolving conflicts and successfully

  1499 expect that after resolving conflicts and successfully

  1549   aaabbbccc

  1552   aaabbbccc

  1550   $ hg status

  1553   $ hg status

  1551   M a

  1554   M a

  1552   $ hg branch

  1555   $ hg branch

  1553   default

  1556   default

  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 

  1557   $ hg init bare_shelve_on_new_branch

  1561   $ hg init bare_shelve_on_new_branch

  1558   $ cd bare_shelve_on_new_branch

  1562   $ cd bare_shelve_on_new_branch

  1622   abort: no unshelve in progress

  1626   abort: no unshelve in progress

  1623   [255]

  1627   [255]

  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

  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

  1631   $ hg shelve

  1635   $ hg shelve

  1632   shelved as default

  1636   shelved as default

  1635   $ hg shelve --list

  1639   $ hg shelve --list

  1636   default         (1s ago)    changes to: 1

  1640   default         (1s ago)    changes to: 1

  1637   $ hg unshelve --keep

  1641   $ hg unshelve --keep

  1638   unshelving change 'default'

  1642   unshelving change 'default'

  1639   rebasing shelved changes

  1643   rebasing shelved changes

  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')

  1644   [1]

  1648   [1]

  1645   $ hg resolve --mark file

  1649   $ hg resolve --mark file

  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

  1650   unshelve of 'default' complete

  1654   unshelve of 'default' complete

  1651   $ hg shelve --list

  1655   $ hg shelve --list