# HG changeset patch # User Pierre-Yves David # Date 1412667718 25200 # Node ID 7a06ad9518c047e92e46d250ae33c1f30997a061 # Parent 5d4c17d11d7e2d344c1304c2c4387ee2a55128c1 merge.update: use `first` instead of direct indexing This makes it compatible with all smartset classes. diff -r 5d4c17d11d7e -r 7a06ad9518c0 mercurial/merge.py --- a/mercurial/merge.py Tue Oct 07 00:33:47 2014 -0700 +++ b/mercurial/merge.py Tue Oct 07 00:41:58 2014 -0700 @@ -1041,7 +1041,7 @@ # get the max revision for the given successors set, # i.e. the 'tip' of a set - node = repo.revs("max(%ln)", successors)[0] + node = repo.revs("max(%ln)", successors).first() pas = [p1] overwrite = force and not branchmerge