Show More
@@ -428,8 +428,8 b' def overridecopy(orig, ui, repo, pats, o' | |||
|
428 | 428 | |
|
429 | 429 | try: |
|
430 | 430 | try: |
|
431 |
# When we call orig below it creates the standins but we don't add |
|
|
432 | # to the dir state until later so lock during that time. | |
|
431 | # When we call orig below it creates the standins but we don't add | |
|
432 | # them to the dir state until later so lock during that time. | |
|
433 | 433 | wlock = repo.wlock() |
|
434 | 434 | |
|
435 | 435 | manifest = repo[None].manifest() |
@@ -313,7 +313,8 b' def reposetup(ui, repo):' | |||
|
313 | 313 | # removed/renamed) |
|
314 | 314 | for lfile in lfiles: |
|
315 | 315 | if lfile in modifiedfiles: |
|
316 |
if os.path.exists( |
|
|
316 | if os.path.exists( | |
|
317 | self.wjoin(lfutil.standin(lfile))): | |
|
317 | 318 | # this handles the case where a rebase is being |
|
318 | 319 | # performed and the working copy is not updated |
|
319 | 320 | # yet. |
@@ -202,12 +202,6 b'' | |||
|
202 | 202 | hgext/keyword.py:0: |
|
203 | 203 | > ui.note("hg ci -m '%s'\n" % msg) |
|
204 | 204 | warning: unwrapped ui message |
|
205 | hgext/largefiles/overrides.py:0: | |
|
206 | > # When we call orig below it creates the standins but we don't add them | |
|
207 | warning: line over 80 characters | |
|
208 | hgext/largefiles/reposetup.py:0: | |
|
209 | > if os.path.exists(self.wjoin(lfutil.standin(lfile))): | |
|
210 | warning: line over 80 characters | |
|
211 | 205 | hgext/mq.py:0: |
|
212 | 206 | > raise util.Abort(_("cannot push --exact with applied patches")) |
|
213 | 207 | warning: line over 80 characters |
General Comments 0
You need to be logged in to leave comments.
Login now