Mercurial > hg

comparison tests/test-merge5.t @ 17849:6da47b655d97 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: check for missing files with --check (issue3595)
author Matt Mackall <mpm@selenic.com>
date Mon, 22 Oct 2012 17:23:31 -0500
parents 610873cf064a
children 76df01e56e7f
comparison
equal deleted inserted replaced
17848:66f0c78350ab 17849:6da47b655d97
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: crosses branches (merge branches or update --check to force update)
18 [255] 18 [255]
19 $ rm b
20 $ hg update -c
21 abort: uncommitted local changes
22 [255]
23 $ hg revert b
19 $ hg update -c 24 $ hg update -c
20 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 25 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
21 $ mv a c 26 $ mv a c
22 27
23 In theory, we shouldn't need the "-y" below, but it prevents this test 28 In theory, we shouldn't need the "-y" below, but it prevents this test