facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

Fix misleading error and prompts during update/merge (issue556)

Browse Source
This commit is contained in:
Thomas Arendsen Hein 2007-12-26 22:47:16 +01:00
parent a802f4255a
commit 94bdbd585c
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mercurial/merge.py
View File

@ -70,8 +70,9 @@ def checkunknown(wctx, mctx):
for f in wctx.unknown():
if f in man:
if mctx.filectx(f).cmp(wctx.filectx(f).data()):
raise util.Abort(_("untracked local file '%s' differs"
" from remote version") % f)
raise util.Abort(_("untracked file in working directory differs"
" from file in requested revision: '%s'")
% f)
def checkcollision(mctx):
"check for case folding collisions in the destination context"
@ -422,8 +423,9 @@ def manifestmerge(repo, p1, p2, pa, overwrite, partial):
elif f in ma:
if n != ma[f] and not overwrite:
if repo.ui.prompt(
(_(" local changed %s which remote deleted\n") % f) +
_("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("d"):
_(" local changed %s which remote deleted\n"
"use (c)hanged version or (d)elete?") % f,
_("[cd]"), _("c")) == _("d"):
act("prompt delete", "r", f)
else:
act("other deleted", "r", f)
@ -455,8 +457,9 @@ def manifestmerge(repo, p1, p2, pa, overwrite, partial):
act("recreating", "g", f, m2.flags(f))
elif n != ma[f]:
if repo.ui.prompt(
(_("remote changed %s which local deleted\n") % f) +
_("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("k"):
_("remote changed %s which local deleted\n"
"use (c)hanged version or leave (d)eleted?") % f,
_("[cd]"), _("c")) == _("c"):
act("prompt recreating", "g", f, m2.flags(f))
else:
act("remote created", "g", f, m2.flags(f))

2
tests/test-merge1.out
View File

@ -10,7 +10,7 @@ diff -r d9e5953b9dec b
M b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
%% merge should fail
abort: untracked local file 'b' differs from remote version
abort: untracked file in working directory differs from file in requested revision: 'b'
%% merge of b expected
merging for b
merging b