Show More
@@ -1337,8 +1337,7 b' def mergeupdate(orig, repo, node, branch' | |||||
1337 | matcher = kwargs.get('matcher', None) |
|
1337 | matcher = kwargs.get('matcher', None) | |
1338 | # note if this is a partial update |
|
1338 | # note if this is a partial update | |
1339 | partial = matcher and not matcher.always() |
|
1339 | partial = matcher and not matcher.always() | |
1340 |
w |
|
1340 | with repo.wlock(): | |
1341 | try: |
|
|||
1342 | # branch | | | |
|
1341 | # branch | | | | |
1343 | # merge | force | partial | action |
|
1342 | # merge | force | partial | action | |
1344 | # -------+-------+---------+-------------- |
|
1343 | # -------+-------+---------+-------------- | |
@@ -1387,8 +1386,6 b' def mergeupdate(orig, repo, node, branch' | |||||
1387 | normallookup=partial) |
|
1386 | normallookup=partial) | |
1388 |
|
1387 | |||
1389 | return result |
|
1388 | return result | |
1390 | finally: |
|
|||
1391 | wlock.release() |
|
|||
1392 |
|
1389 | |||
1393 | def scmutilmarktouched(orig, repo, files, *args, **kwargs): |
|
1390 | def scmutilmarktouched(orig, repo, files, *args, **kwargs): | |
1394 | result = orig(repo, files, *args, **kwargs) |
|
1391 | result = orig(repo, files, *args, **kwargs) |
General Comments 0
You need to be logged in to leave comments.
Login now