Show More
@@ -372,7 +372,7 b' def overrideupdate(orig, ui, repo, *pats' | |||||
372 | wlock.release() |
|
372 | wlock.release() | |
373 |
|
373 | |||
374 | # Before starting the manifest merge, merge.updates will call |
|
374 | # Before starting the manifest merge, merge.updates will call | |
375 |
# |
|
375 | # checkunknown to check if there are any files in the merged-in | |
376 | # changeset that collide with unknown files in the working copy. |
|
376 | # changeset that collide with unknown files in the working copy. | |
377 | # |
|
377 | # | |
378 | # The largefiles are seen as unknown, so this prevents us from merging |
|
378 | # The largefiles are seen as unknown, so this prevents us from merging |
@@ -6184,7 +6184,7 b' def update(ui, repo, node=None, rev=None' | |||||
6184 | raise util.Abort(_("uncommitted changes")) |
|
6184 | raise util.Abort(_("uncommitted changes")) | |
6185 | if rev is None: |
|
6185 | if rev is None: | |
6186 | rev = repo[repo[None].branch()].rev() |
|
6186 | rev = repo[repo[None].branch()].rev() | |
6187 |
mergemod. |
|
6187 | mergemod.checkunknown(repo, repo[None], repo[rev]) | |
6188 |
|
6188 | |||
6189 | repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
|
6189 | repo.ui.setconfig('ui', 'forcemerge', tool, 'update') | |
6190 |
|
6190 |
@@ -304,7 +304,7 b' def _checkunknownfile(repo, wctx, mctx, ' | |||||
304 | and repo.dirstate.normalize(f) not in repo.dirstate |
|
304 | and repo.dirstate.normalize(f) not in repo.dirstate | |
305 | and mctx[f].cmp(wctx[f])) |
|
305 | and mctx[f].cmp(wctx[f])) | |
306 |
|
306 | |||
307 |
def |
|
307 | def checkunknown(repo, wctx, mctx): | |
308 | "check for collisions between unknown files and files in mctx" |
|
308 | "check for collisions between unknown files and files in mctx" | |
309 |
|
309 | |||
310 | error = False |
|
310 | error = False |
General Comments 0
You need to be logged in to leave comments.
Login now