Mercurial > hg

comparison tests/test-merge5.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 6da47b655d97
children ab3e42225dbc
comparison
equal deleted inserted replaced
19797:a9abdb168425 19798:76df01e56e7f
12 removing b 12 removing b
13 created new head 13 created new head
14 $ hg update 1 14 $ hg update 1
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
16 $ hg update 16 $ hg update
17 abort: crosses branches (merge branches or update --check to force update) 17 abort: not a linear update
18 (merge or update --check to force update)
18 [255] 19 [255]
19 $ rm b 20 $ rm b
20 $ hg update -c 21 $ hg update -c
21 abort: uncommitted local changes 22 abort: uncommitted local changes
22 [255] 23 [255]