Submitter | Augie Fackler |
---|---|
Date | Nov. 22, 2016, 3:01 a.m. |
Message ID | <e46571ef16ffc14d1b88.1479783697@imladris.local> |
Download | mbox | patch |
Permalink | /patch/17676/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -1484,11 +1484,6 @@ def update(repo, node, branchmerge, forc if ancestor is not None: pas = [repo[ancestor]] - if node is None: - repo.ui.deprecwarn('update with no target', '3.9') - rev, _mark, _act = destutil.destupdate(repo) - node = repo[rev].node() - overwrite = force and not branchmerge p2 = repo[node]