marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11539 AFFECTED FILES mercurial/cmdutil.py CHANGE DETAILS diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -1642,7 +1642,9 @@ reltarget = repo.pathto(abstarget, cwd) target = repo.wjoin(abstarget) src = repo.wjoin(abssrc) - state = repo.dirstate[abstarget] + entry = repo.dirstate.get_entry(abstarget) + + already_commited = entry.tracked and not entry.added scmutil.checkportable(ui, abstarget) @@ -1672,9 +1674,9 @@ exists = False samefile = True - if not after and exists or after and state in b'mn': + if not after and exists or after and already_commited: if not opts[b'force']: - if state in b'mn': + if already_commited: msg = _(b'%s: not overwriting - file already committed\n') if after: flags = b'--after --force' To: marmoute, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
