Mercurial > hg-stable

comparison tests/test-shelve.t @ 30342:318a24b52eeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling: fixes of non-dictionary words
author Mads Kiilerich <madski@unity3d.com>
date Mon, 17 Oct 2016 23:16:55 +0200
parents d65e246100ed
children ce3a133f71b3
comparison
equal deleted inserted replaced
30341:b19291e5d506 30342:318a24b52eeb
1491 default 1491 default
1492 1492
1493 When i unshelve resulting in merge conflicts and makes saved 1493 When i unshelve resulting in merge conflicts and makes saved
1494 file shelvedstate looks like in previous versions in 1494 file shelvedstate looks like in previous versions in
1495 mercurial(without restore branch information in 7th line) i 1495 mercurial(without restore branch information in 7th line) i
1496 expect that after resolving conflicts and succesfully 1496 expect that after resolving conflicts and successfully
1497 running 'shelve --continue' the branch information won't be 1497 running 'shelve --continue' the branch information won't be
1498 restored and branch will be unchanged. 1498 restored and branch will be unchanged.
1499 1499
1500 shelve on new branch, conflict with previous shelvedstate 1500 shelve on new branch, conflict with previous shelvedstate
1501 1501
1585 ? b 1585 ? b
1586 $ hg branch 1586 $ hg branch
1587 default 1587 default
1588 $ cd .. 1588 $ cd ..
1589 1589
1590 Prepare unshleve with a corrupted shelvedstate 1590 Prepare unshelve with a corrupted shelvedstate
1591 $ hg init r1 && cd r1 1591 $ hg init r1 && cd r1
1592 $ echo text1 > file && hg add file 1592 $ echo text1 > file && hg add file
1593 $ hg shelve 1593 $ hg shelve
1594 shelved as default 1594 shelved as default
1595 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1595 0 files updated, 0 files merged, 1 files removed, 0 files unresolved