D6375: commit: fix a typo ("form p1" -> "from p1")

[martinvonz (Martin von Zweigbergk)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8988e640a8ac: commit: fix a typo ("form p1" -> "from p1") (authored by martinvonz, committed by ).

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D6375?vs=15085&id=15098#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6375?vs=15085&id=15098

REVISION DETAIL
  https://phab.mercurial-scm.org/D6375

AFFECTED FILES
  mercurial/localrepo.py
  tests/test-graft.t
  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/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -755,7 +755,7 @@
   committing files:
   b
   warning: can't find ancestor for 'b' copied from 'a'!
-  reusing manifest form p1 (listed files actually unchanged)
+  reusing manifest from p1 (listed files actually unchanged)
   committing changelog
   updating the branch cache
   $ hg log -r 'destination(13)'
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, pulkit
Cc: mercurial-devel