comparison mercurial/merge.py @ 15887:12dea4d998ec

bookmarks: primarily use repo lock, not wlock Bookmarks are repository data, not working directory data. Only the current bookmark is working directory data. Some lock shuffling is required to avoid lockout between the initial mock lock and locking of the localrepo instance that is created after copying.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 13 Jan 2012 02:30:43 +0100
parents 0bd17a4bed88
children 44fa047cef57
comparison
equal deleted inserted replaced
15886:a5917346c72e 15887:12dea4d998ec