Mercurial > hg
comparison mercurial/merge.py @ 30903:dd995a5db8fd
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 | 330fbd515512 |
comparison
equal
deleted
inserted
replaced
| 30902:e6932e9a262a | 30903:dd995a5db8fd |
|---|---|
| 1552 | 1552 |
| 1553 if pas not in ([p1], [p2]): # nonlinear | 1553 if pas not in ([p1], [p2]): # nonlinear |
| 1554 dirty = wc.dirty(missing=True) | 1554 dirty = wc.dirty(missing=True) |
| 1555 if dirty: | 1555 if dirty: |
| 1556 # Branching is a bit strange to ensure we do the minimal | 1556 # Branching is a bit strange to ensure we do the minimal |
| 1557 # amount of call to obsolete.background. | 1557 # amount of call to obsolete.foreground. |
| 1558 foreground = obsolete.foreground(repo, [p1.node()]) | 1558 foreground = obsolete.foreground(repo, [p1.node()]) |
| 1559 # note: the <node> variable contains a random identifier | 1559 # note: the <node> variable contains a random identifier |
| 1560 if repo[node].node() in foreground: | 1560 if repo[node].node() in foreground: |
| 1561 pass # allow updating to successors | 1561 pass # allow updating to successors |
| 1562 else: | 1562 else: |