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

login
register
mail settings
Submitter phabricator
Date May 15, 2019, 4:22 a.m.
Message ID <differential-rev-PHID-DREV-ddtpbcjmy7m623wvxu25-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/40032/
State Superseded
Headers show

Comments

phabricator - May 15, 2019, 4:22 a.m.
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




To: martinvonz, #hg-reviewers
Cc: mercurial-devel
phabricator - May 15, 2019, 5:32 p.m.
pulkit added a comment.


  Amending the following diff in flight:
  
    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 @@ Transplants of grafts can find a destina
       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)'

REPOSITORY
  rHG Mercurial

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

To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
phabricator - May 15, 2019, 5:35 p.m.
martinvonz added a comment.


  In https://phab.mercurial-scm.org/D6375#92739, @pulkit wrote:
  
  > Amending the following diff in flight:
  >
  >   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 @@ Transplants of grafts can find a destina
  >      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)'
  >
  
  
  Thanks! (and sorry I didn't notice that)

REPOSITORY
  rHG Mercurial

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

To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel

Patch

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: