Show More
@@ -320,6 +320,7 def override_copy(orig, ui, repo, pats, | |||||
320 | nonormalfiles = False |
|
320 | nonormalfiles = False | |
321 | nolfiles = False |
|
321 | nolfiles = False | |
322 | try: |
|
322 | try: | |
|
323 | try: | |||
323 | installnormalfilesmatchfn(repo[None].manifest()) |
|
324 | installnormalfilesmatchfn(repo[None].manifest()) | |
324 | result = orig(ui, repo, pats, opts, rename) |
|
325 | result = orig(ui, repo, pats, opts, rename) | |
325 | except util.Abort, e: |
|
326 | except util.Abort, e: | |
@@ -339,6 +340,7 def override_copy(orig, ui, repo, pats, | |||||
339 | return result |
|
340 | return result | |
340 |
|
341 | |||
341 | try: |
|
342 | try: | |
|
343 | try: | |||
342 | # When we call orig below it creates the standins but we don't add them |
|
344 | # When we call orig below it creates the standins but we don't add them | |
343 | # to the dir state until later so lock during that time. |
|
345 | # to the dir state until later so lock during that time. | |
344 | wlock = repo.wlock() |
|
346 | wlock = repo.wlock() |
General Comments 0
You need to be logged in to leave comments.
Login now