Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 3620:3109f012c305
Clarify untracked file merge message
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 01 Nov 2006 21:47:55 -0600 |
parents | 9bfb3c049b2a |
children | eb0b4a2d70a9 |
comparison
equal
deleted
inserted
replaced
3617:638193139ba8 | 3620:3109f012c305 |
---|---|
63 "check for collisions between unknown files and files in mctx" | 63 "check for collisions between unknown files and files in mctx" |
64 man = mctx.manifest() | 64 man = mctx.manifest() |
65 for f in wctx.unknown(): | 65 for f in wctx.unknown(): |
66 if f in man: | 66 if f in man: |
67 if mctx.filectx(f).cmp(wctx.filectx(f).data()): | 67 if mctx.filectx(f).cmp(wctx.filectx(f).data()): |
68 raise util.Abort(_("'%s' already exists in the working" | 68 raise util.Abort(_("untracked local file '%s' differs"\ |
69 " dir and differs from remote") % f) | 69 " from remote version") % f) |
70 | 70 |
71 def forgetremoved(wctx, mctx): | 71 def forgetremoved(wctx, mctx): |
72 """ | 72 """ |
73 Forget removed files | 73 Forget removed files |
74 | 74 |