Show More
@@ -724,8 +724,8 b' def clone(ui, source, dest=None, **opts)' | |||||
724 | # can end up with extra data in the cloned revlogs that's |
|
724 | # can end up with extra data in the cloned revlogs that's | |
725 | # not pointed to by changesets, thus causing verify to |
|
725 | # not pointed to by changesets, thus causing verify to | |
726 | # fail |
|
726 | # fail | |
727 | l1 = lock.lock(os.path.join(source, ".hg", "lock")) |
|
727 | l1 = other.lock() | |
728 |
except |
|
728 | except lock.LockException: | |
729 | copy = False |
|
729 | copy = False | |
730 |
|
730 | |||
731 | if copy: |
|
731 | if copy: |
@@ -508,7 +508,7 b' class localrepository(object):' | |||||
508 | if not wlock: |
|
508 | if not wlock: | |
509 | try: |
|
509 | try: | |
510 | wlock = self.wlock(wait=0) |
|
510 | wlock = self.wlock(wait=0) | |
511 |
except lock.Lock |
|
511 | except lock.LockException: | |
512 | wlock = None |
|
512 | wlock = None | |
513 | lookup, modified, added, removed, deleted, unknown = ( |
|
513 | lookup, modified, added, removed, deleted, unknown = ( | |
514 | self.dirstate.changes(files, match)) |
|
514 | self.dirstate.changes(files, match)) |
General Comments 0
You need to be logged in to leave comments.
Login now