Mercurial > hg
changeset 42286:8988e640a8ac
commit: fix a typo ("form p1" -> "from p1")
Differential Revision: https://phab.mercurial-scm.org/D6375
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 14 May 2019 16:40:49 -0700 |
| parents | 65b3ef162b39 |
| children | 5265c7d47213 |
| files | mercurial/localrepo.py tests/test-graft.t tests/test-merge-no-file-change.t |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Sat Apr 27 11:48:26 2019 -0700 +++ b/mercurial/localrepo.py Tue May 14 16:40:49 2019 -0700 @@ -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:
--- a/tests/test-graft.t Sat Apr 27 11:48:26 2019 -0700 +++ b/tests/test-graft.t Tue May 14 16:40:49 2019 -0700 @@ -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)'
--- a/tests/test-merge-no-file-change.t Sat Apr 27 11:48:26 2019 -0700 +++ b/tests/test-merge-no-file-change.t Tue May 14 16:40:49 2019 -0700 @@ -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