Mercurial > hg

comparison tests/test-update-branches.t @ 19798:76df01e56e7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: improve error message for clean non-linear update
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 17:43:33 -0700
parents a59e575c6ff8
children ab3e42225dbc
comparison
equal deleted inserted replaced
19797:a9abdb168425 19798:76df01e56e7f
92 $ norevtest 'none clean linear' clean 4 92 $ norevtest 'none clean linear' clean 4
93 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 93 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
94 parent=5 94 parent=5
95 95
96 $ norevtest 'none clean same' clean 2 96 $ norevtest 'none clean same' clean 2
97 abort: crosses branches (merge branches or update --check to force update) 97 abort: not a linear update
98 (merge or update --check to force update)
98 parent=2 99 parent=2
99 100
100 101
101 $ revtest 'none clean linear' clean 1 2 102 $ revtest 'none clean linear' clean 1 2
102 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 103 1 files updated, 0 files merged, 0 files removed, 0 files unresolved