Mercurial > hg-stable

changeset 25023:405cb38448ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: remove duplicated definition of choice() from addset._iterordered() choice() is already defined before val1 = None. Perhaps there was merge or rebase error.
author Yuya Nishihara <yuya@tcha.org>
date Mon, 27 Apr 2015 23:03:20 +0900
parents 10bbdcd89164
children 263bbed1833c
files mercurial/revset.py
diffstat 1 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/revset.py	Tue May 12 19:40:45 2015 -0500
+++ b/mercurial/revset.py	Mon Apr 27 23:03:20 2015 +0900
@@ -3044,10 +3044,6 @@
 
         val1 = None
         val2 = None
-
-        choice = max
-        if ascending:
-            choice = min
         try:
             # Consume both iterators in an ordered way until one is
             # empty