Mercurial > hg
comparison hgext/largefiles/overrides.py @ 16094:0776a6cababe
merge: don't use unknown()
This removes use of unknown files for building the synthetic working
directory manifest used by manifestmerge. Instead, we adopt the
strategy used by _checkunknown.
Side-effect: unknown files are no longer moved by remote directory
renames, and now are left alone like ignored files.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 09 Feb 2012 17:04:17 -0600 |
parents | 7e30f5f2285f |
children | cb756482c1aa |
comparison
equal
deleted
inserted
replaced
16093:7e30f5f2285f | 16094:0776a6cababe |
---|---|
317 if repo.ui.promptchoice(msg, choices, 0) == 0: | 317 if repo.ui.promptchoice(msg, choices, 0) == 0: |
318 processed.append((lfile, "r")) | 318 processed.append((lfile, "r")) |
319 processed.append((standin, "g", p2.flags(standin))) | 319 processed.append((standin, "g", p2.flags(standin))) |
320 else: | 320 else: |
321 processed.append((standin, "r")) | 321 processed.append((standin, "r")) |
322 elif m == "m" and lfutil.standin(f) in p1 and f in p2: | 322 elif m == "g" and lfutil.standin(f) in p1 and f in p2: |
323 # Case 2: largefile in the working copy, normal file in | 323 # Case 2: largefile in the working copy, normal file in |
324 # the second parent | 324 # the second parent |
325 standin = lfutil.standin(f) | 325 standin = lfutil.standin(f) |
326 lfile = f | 326 lfile = f |
327 msg = _('%s has been turned into a normal file\n' | 327 msg = _('%s has been turned into a normal file\n' |