Mercurial > public > mercurial-scm > hg-stable

diff 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
line wrap: on
line diff
--- a/tests/test-merge5.t	Mon Oct 22 16:06:47 2012 -0500
+++ b/tests/test-merge5.t	Mon Oct 22 17:23:31 2012 -0500
@@ -16,6 +16,11 @@
   $ hg update
   abort: crosses branches (merge branches or update --check to force update)
   [255]
+  $ rm b
+  $ hg update -c
+  abort: uncommitted local changes
+  [255]
+  $ hg revert b
   $ hg update -c
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mv a c