facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity

update: fix typo/stale comment to match code

Browse Source 
The comment about "obsolete.background" seems to have been about
obsolete.foreground ever since it was introduced in fbdfa64ceced
(update: allow dirty update to foreground (successors), 2013-04-16),
so let's change it.
This commit is contained in:
Martin von Zweigbergk 2017-02-09 09:55:31 -08:00
parent 04e8402860
commit 38e7618603
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/merge.py
View File

@ -1554,7 +1554,7 @@ def update(repo, node, branchmerge, force, ancestor=None,
dirty = wc.dirty(missing=True) dirty = wc.dirty(missing=True)
if dirty: if dirty:
# Branching is a bit strange to ensure we do the minimal # Branching is a bit strange to ensure we do the minimal
# amount of call to obsolete.background. # amount of call to obsolete.foreground.
foreground = obsolete.foreground(repo, [p1.node()]) foreground = obsolete.foreground(repo, [p1.node()])
# note: the <node> variable contains a random identifier # note: the <node> variable contains a random identifier
if repo[node].node() in foreground: if repo[node].node() in foreground: