Mercurial > hg

diff mercurial/mergestate.py @ 45277:c515c54f6530

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove no longer required ACTION_GET_OTHER_AND_STORE In 1b8fd4af33189c84feadb47c74d659ec31cde3b9 I (ab)used merge actions to pass info from manifestmerge() to applyupdates() and store info in mergestate. In previous patches, we introduced a separate return value from manifestmerge() and calculateupdates() and an argument to applyupdates() which achieved the same thing. Let's remove this no longer required messy code. Differential Revision: https://phab.mercurial-scm.org/D8744
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 14 Jul 2020 16:40:28 +0530
parents a5be403dd7a0
children fa18b02df8dd
line wrap: on
line diff
--- a/mercurial/mergestate.py	Tue Jul 14 16:31:52 2020 +0530
+++ b/mercurial/mergestate.py	Tue Jul 14 16:40:28 2020 +0530
@@ -113,8 +113,6 @@
 ACTION_KEEP = b'k'
 ACTION_EXEC = b'e'
 ACTION_CREATED_MERGE = b'cm'
-# GET the other/remote side and store this info in mergestate
-ACTION_GET_OTHER_AND_STORE = b'gs'
 
 
 class mergestate(object):