Show More
@@ -272,17 +272,17 b' def reposetup(ui, repo):' | |||
|
272 | 272 | |
|
273 | 273 | wlock = self.wlock() |
|
274 | 274 | try: |
|
275 |
# Case 0: |
|
|
276 | # We have to take the time to pull down the new largefiles now. | |
|
277 | # Otherwise, any largefiles that were modified in the | |
|
278 | # destination changesets get overwritten, either by the rebase | |
|
279 | # or in the first commit after the rebase or transplant. | |
|
280 | # updatelfiles will update the dirstate to mark any pulled | |
|
281 | # largefiles as modified | |
|
275 | # Case 0: Automated committing | |
|
276 | # | |
|
277 | # While automated committing (like rebase, transplant | |
|
278 | # and so on), this code path is used to avoid: | |
|
279 | # (1) updating standins, because standins should | |
|
280 | # be already updated at this point | |
|
281 | # (2) aborting when stadnins are matched by "match", | |
|
282 | # because automated committing may specify them directly | |
|
283 | # | |
|
282 | 284 | if getattr(self, "_isrebasing", False) or \ |
|
283 | 285 | getattr(self, "_istransplanting", False): |
|
284 | lfcommands.updatelfiles(self.ui, self, filelist=None, | |
|
285 | printmessage=False) | |
|
286 | 286 | result = orig(text=text, user=user, date=date, match=match, |
|
287 | 287 | force=force, editor=editor, extra=extra) |
|
288 | 288 |
General Comments 0
You need to be logged in to leave comments.
Login now