Closed by commit rHG0e5e192adb6f: tests: use new, use-case-specific methods
from merge module (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
martinvonz added a comment.
Moved formatting fix to parent patch
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8169/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8169
To: martinvonz, #hg-reviewers
Cc: pulkit, mercurial-devel
martinvonz marked an inline comment as done.
martinvonz updated this revision to Diff 20359.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D8169?vs=20345=20359
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8169/new/
pulkit added inline comments.
INLINE COMMENTS
> hg.py:1144
> unresolved conflicts."""
> -stats = mergemod.merge(repo[node], force=force, labels=labels,)
> +stats = mergemod.merge(repo[node], force=force, labels=labels)
> _showstats(repo, stats)
This seems like unrelated
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D8169
AFFECTED FILES
mercurial/hg.py
tests/test-revlog-ancestry.py
CHANGE
