comparison contrib/simplemerge @ 29294:077d0535f51f stable

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/ .
author Mads Kiilerich <madski@unity3d.com>
date Wed, 01 Jun 2016 21:40:52 +0200
parents 863075fd4cd0
children d83ca854fa21
comparison
equal deleted inserted replaced
29272:e82ca7d0967c 29294:077d0535f51f