changeset 25168 | 4dfd4d3b9b93 |
parent 25147 | fb7b9a765bb9 |
child 25169 | 7855d1f5f152 |
--- a/mercurial/cmdutil.py Sat May 16 15:46:54 2015 -0700 +++ b/mercurial/cmdutil.py Mon May 18 12:17:08 2015 -0500 @@ -1933,10 +1933,7 @@ # --follow with FILE behaviour depends on revs... it = iter(revs) startrev = it.next() - try: - followdescendants = startrev < it.next() - except (StopIteration): - followdescendants = False + followdescendants = startrev < next(it, startrev) # branch and only_branch are really aliases and must be handled at # the same time