Mercurial > hg

comparison tests/test-merge5.t @ 19799:ab3e42225dbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: add error message for dirty non-linear update with no rev Previously, the error message for a dirty non-linear update was the same (and relatively unhelpful) whether or not a rev was specified. This patch and an upcoming one will introduce separate, more helpful hints.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 20:07:30 -0700
parents 76df01e56e7f
children 41abe2e3e3b7
comparison
equal deleted inserted replaced
19798:76df01e56e7f 19799:ab3e42225dbc
31 or delete". 31 or delete".
32 32
33 Should abort: 33 Should abort:
34 34
35 $ hg update -y 1 35 $ hg update -y 1
36 abort: crosses branches (merge branches or use --clean to discard changes) 36 abort: uncommitted changes
37 (commit or update --clean to discard changes)
37 [255] 38 [255]
38 $ mv c a 39 $ mv c a
39 40
40 Should succeed: 41 Should succeed:
41 42