Show More
@@ -90,11 +90,16 b' def _checkunknown(wctx, mctx, folding):' | |||||
90 | folded = {} |
|
90 | folded = {} | |
91 | for fn in mctx: |
|
91 | for fn in mctx: | |
92 | folded[foldf(fn)] = fn |
|
92 | folded[foldf(fn)] = fn | |
|
93 | ||||
|
94 | error = False | |||
93 | for fn in wctx.unknown(): |
|
95 | for fn in wctx.unknown(): | |
94 | f = foldf(fn) |
|
96 | f = foldf(fn) | |
95 | if f in folded and mctx[folded[f]].cmp(wctx[f]): |
|
97 | if f in folded and mctx[folded[f]].cmp(wctx[f]): | |
96 | raise util.Abort(_("untracked file in working directory differs" |
|
98 | error = True | |
97 | " from file in requested revision: '%s'") % fn) |
|
99 | wctx._repo.ui.warn(_("%s: untracked file differs\n") % fn) | |
|
100 | if error: | |||
|
101 | raise util.Abort(_("untracked files in working directory differ " | |||
|
102 | "from files in requested revision")) | |||
98 |
|
103 | |||
99 | def _checkcollision(mctx, wctx): |
|
104 | def _checkcollision(mctx, wctx): | |
100 | "check for case folding collisions in the destination context" |
|
105 | "check for case folding collisions in the destination context" |
@@ -66,7 +66,8 b' no clobbering of untracked files with wr' | |||||
66 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
66 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
67 | $ echo gold > a |
|
67 | $ echo gold > a | |
68 | $ hg up |
|
68 | $ hg up | |
69 | abort: untracked file in working directory differs from file in requested revision: 'a' |
|
69 | a: untracked file differs | |
|
70 | abort: untracked files in working directory differ from files in requested revision | |||
70 | [255] |
|
71 | [255] | |
71 |
$ |
|
72 | $ cat a | |
72 | gold |
|
73 | gold |
@@ -66,7 +66,8 b' no merges expected' | |||||
66 | $ echo This is file b2 > b |
|
66 | $ echo This is file b2 > b | |
67 | merge should fail |
|
67 | merge should fail | |
68 | $ hg merge 1 |
|
68 | $ hg merge 1 | |
69 | abort: untracked file in working directory differs from file in requested revision: 'b' |
|
69 | b: untracked file differs | |
|
70 | abort: untracked files in working directory differ from files in requested revision | |||
70 | [255] |
|
71 | [255] | |
71 | merge of b expected |
|
72 | merge of b expected | |
72 | $ hg merge -f 1 |
|
73 | $ hg merge -f 1 |
General Comments 0
You need to be logged in to leave comments.
Login now