comparison mercurial/simplemerge.py @ 16681:0128cdb846d9 stable

mq: qimport need wlock for --push - do that after releasing lock qimport locking was introduced for phases in 29ea059be33c.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Mon, 30 Jan 2012 17:37:45 +0100
parents 7de7630053cb
children 525fdb738975
comparison
equal deleted inserted replaced
16680:d0e419b0f7de 16681:0128cdb846d9