D6375: commit: fix a typo ("form p1" -> "from p1")
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed May 15 04:22:24 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6375
AFFECTED FILES
mercurial/localrepo.py
tests/test-merge-no-file-change.t
CHANGE DETAILS
diff --git a/tests/test-merge-no-file-change.t b/tests/test-merge-no-file-change.t
--- a/tests/test-merge-no-file-change.t
+++ b/tests/test-merge-no-file-change.t
@@ -137,7 +137,7 @@
$ hg ci --debug -m merge
committing files:
b
- reusing manifest form p1 (listed files actually unchanged)
+ reusing manifest from p1 (listed files actually unchanged)
committing changelog
updating the branch cache
committed changeset 3:c8d50407916ef8a5a97cb6e36ca9bc844a6ee13e
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -2642,7 +2642,7 @@
p1.manifestnode(), p2.manifestnode(),
added, drop, match=self.narrowmatch())
else:
- self.ui.debug('reusing manifest form p1 (listed files '
+ self.ui.debug('reusing manifest from p1 (listed files '
'actually unchanged)\n')
mn = p1.manifestnode()
else:
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list