diff mercurial/merge.py @ 30068:a76d5ba7ac43

pull: grab wlock during pull because pull might move bookmarks and bookmark are protected by wlock, we have to grab wlock for pull :-( This required a small upgrade of the 'lockdelay' extension used by 'test-clone.t' because the delay must apply to a single lock only.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Tue, 23 Aug 2016 23:47:59 +0200
parents a145161debed
children 98d3d8108db0
line wrap: on
line diff