Mercurial > hg

changeset 30903:dd995a5db8fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: fix typo/stale comment to match code The comment about "obsolete.background" seems to have been about obsolete.foreground ever since it was introduced in a59e575c6ff8 (update: allow dirty update to foreground (successors), 2013-04-16), so let's change it.
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 09 Feb 2017 09:55:31 -0800
parents e6932e9a262a
children 76a1e735449c
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Feb 08 23:03:33 2017 -0800
+++ b/mercurial/merge.py	Thu Feb 09 09:55:31 2017 -0800
@@ -1554,7 +1554,7 @@
                 dirty = wc.dirty(missing=True)
                 if dirty:
                     # 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()])
                     # note: the <node> variable contains a random identifier
                     if repo[node].node() in foreground: