Submitter | phabricator |
---|---|
Date | Sept. 28, 2020, 3:55 p.m. |
Message ID | <differential-rev-PHID-DREV-zm4giyf4jf4vayenismi-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/47325/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -1049,6 +1049,10 @@ When overwrite is set, changes are clobbered, merged else returns stats (see pydoc mercurial.merge.applyupdates)""" + repo.ui.deprecwarn( + b'prefer merge.update() or merge.clean_update() over hg.updaterepo()', + b'5.7', + ) return mergemod._update( repo, node,