Mercurial > public > mercurial-scm > hg

diff mercurial/interfaces/dirstate.py @ 47911:3d2c17c5d7f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: drop the deprecated `otherparent` method The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11346
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 24 Aug 2021 21:09:01 +0200
parents 50bed873a765
children 91afee6f959e
line wrap: on
line diff
--- a/mercurial/interfaces/dirstate.py	Tue Aug 24 21:08:37 2021 +0200
+++ b/mercurial/interfaces/dirstate.py	Tue Aug 24 21:09:01 2021 +0200
@@ -132,9 +132,6 @@
     def copies():
         pass
 
-    def otherparent(f):
-        '''Mark as coming from the other parent, always dirty.'''
-
     def add(f):
         '''Mark a file added.'''