Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 42286:8988e640a8ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 39b63f9d7464
children 278dcb24e535
comparison
equal deleted inserted replaced
42285:65b3ef162b39 42286:8988e640a8ac
2640 # so this is safe. 2640 # so this is safe.
2641 mn = mctx.write(trp, linkrev, 2641 mn = mctx.write(trp, linkrev,
2642 p1.manifestnode(), p2.manifestnode(), 2642 p1.manifestnode(), p2.manifestnode(),
2643 added, drop, match=self.narrowmatch()) 2643 added, drop, match=self.narrowmatch())
2644 else: 2644 else:
2645 self.ui.debug('reusing manifest form p1 (listed files ' 2645 self.ui.debug('reusing manifest from p1 (listed files '
2646 'actually unchanged)\n') 2646 'actually unchanged)\n')
2647 mn = p1.manifestnode() 2647 mn = p1.manifestnode()
2648 else: 2648 else:
2649 self.ui.debug('reusing manifest from p1 (no file change)\n') 2649 self.ui.debug('reusing manifest from p1 (no file change)\n')
2650 mn = p1.manifestnode() 2650 mn = p1.manifestnode()