Mercurial > hg
diff tests/test-merge1.t @ 34552:33c8a6837181
merge: check for path conflicts when updating (issue5628)
When updating to a new revision, check for path conflicts caused by unknown
files in the working directory, and handle these by backing up the file or
directory and replacing it.
Differential Revision: https://phab.mercurial-scm.org/D781
author | Mark Thomas <mbthomas@fb.com> |
---|---|
date | Mon, 02 Oct 2017 14:05:30 -0700 |
parents | 06a740540ea1 |
children | 0217d66846f7 |
line wrap: on
line diff
--- a/tests/test-merge1.t Mon Oct 02 14:05:30 2017 -0700 +++ b/tests/test-merge1.t Mon Oct 02 14:05:30 2017 -0700 @@ -30,17 +30,17 @@ $ mkdir b && touch b/nonempty $ hg up - abort: *: '$TESTTMP/t/b' (glob) + b: untracked file differs + abort: untracked files in working directory differ from files in requested revision [255] $ hg ci - abort: last update was interrupted - (use 'hg update' to get a consistent checkout) - [255] + nothing changed + [1] $ hg sum parent: 0:538afb845929 commit #0 branch: default - commit: 1 unknown (interrupted update) + commit: 1 unknown (clean) update: 1 new changesets (update) phases: 2 draft $ rm b/nonempty