Mercurial > hg

comparison tests/test-merge1.t @ 34553:0217d66846f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: improve error messages for path conflicts during update Differential Revision: https://phab.mercurial-scm.org/D782
author Mark Thomas <mbthomas@fb.com>
date Mon, 02 Oct 2017 14:05:30 -0700
parents 33c8a6837181
children 2a774cae3a03
comparison
equal deleted inserted replaced
34552:33c8a6837181 34553:0217d66846f7
28 Test interrupted updates by having a non-empty dir with the same name as one 28 Test interrupted updates by having a non-empty dir with the same name as one
29 of the files in a commit we're updating to 29 of the files in a commit we're updating to
30 30
31 $ mkdir b && touch b/nonempty 31 $ mkdir b && touch b/nonempty
32 $ hg up 32 $ hg up
33 b: untracked file differs 33 b: untracked directory conflicts with file
34 abort: untracked files in working directory differ from files in requested revision 34 abort: untracked files in working directory differ from files in requested revision
35 [255] 35 [255]
36 $ hg ci 36 $ hg ci
37 nothing changed 37 nothing changed
38 [1] 38 [1]