# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2016-06-01 19:40:52
# Node ID 077d0535f51f9e40d2e3ffc74c5d2c3badc4407c
# Parent  e82ca7d0967cd10d92562820297c3413abe6fc29

bundle2: don't assume ordering of heads checked after push

Usually, the heads will have the same ordering in handlecheckheads. Insisting
on the same ordering is however an unnecessary constraint that in some custom
cases can cause pushes to fail even though the actual heads didn't change. This
caused production issues for us in combination with the current version of
https://bitbucket.org/Unity-Technologies/hgwebcachingproxy/ .

diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
--- a/mercurial/bundle2.py
+++ b/mercurial/bundle2.py
@@ -1453,7 +1453,7 @@ def handlecheckheads(op, inpart):
     # Trigger a transaction so that we are guaranteed to have the lock now.
     if op.ui.configbool('experimental', 'bundle2lazylocking'):
         op.gettransaction()
-    if heads != op.repo.heads():
+    if sorted(heads) != sorted(op.repo.heads()):
         raise error.PushRaced('repository changed while pushing - '
                               'please try again')