equal
deleted
inserted
replaced
35 |
35 |
36 $ hg up -q 0 |
36 $ hg up -q 0 |
37 $ mkdir a |
37 $ mkdir a |
38 $ echo 3 > a/b |
38 $ echo 3 > a/b |
39 $ hg up file |
39 $ hg up file |
40 a: untracked file differs |
40 a: untracked directory conflicts with file |
41 abort: untracked files in working directory differ from files in requested revision |
41 abort: untracked files in working directory differ from files in requested revision |
42 [255] |
42 [255] |
43 $ hg up --clean file |
43 $ hg up --clean file |
44 abort: *: '$TESTTMP/repo/a' (glob) |
44 abort: *: '$TESTTMP/repo/a' (glob) |
45 [255] |
45 [255] |