Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-shelve.t
changeset 28941 8353d154a9bd
parent 28627 d7af9b4ae7dd
child 29536 b17a6e3cd2ac
equal deleted inserted replaced
28940:4a359b8f8fae 28941:8353d154a9bd 
  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 succesfully
 
  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   $ hg init shelve_on_new_branch_conflict_with_previous_shelvedstate
 
  1500 shelve on new branch, conflict with previous shelvedstate
 
  1501   $ cd shelve_on_new_branch_conflict_with_previous_shelvedstate
 
  1501 
       
  1502   $ hg init conflict
 
       
  1503   $ cd conflict
 
  1502   $ echo "aaa" >> a
 
  1504   $ echo "aaa" >> a
 
  1503   $ hg commit -A -m "a"
 
  1505   $ hg commit -A -m "a"
 
  1504   adding a
 
  1506   adding a
 
  1505   $ hg branch
 
  1507   $ hg branch
 
  1506   default
 
  1508   default
mercurial