Mercurial > hg
comparison mercurial/merge.py @ 26949:b639b2f186bf
merge.applyupdates: only attempt to merge files in mergeactions
This only makes a difference when a merge driver is active -- in that case we
don't want to try and merge all the files, just the ones still unresolved after
the merge driver's preprocess step is over.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Thu, 12 Nov 2015 14:29:02 -0800 |
| parents | ab798d1a230f |
| children | d16d73173fdd |
comparison
equal
deleted
inserted
replaced
| 26948:067ab07435c9 | 26949:b639b2f186bf |
|---|---|
| 968 newactions.append((f, args, msg)) | 968 newactions.append((f, args, msg)) |
| 969 mergeactions = newactions | 969 mergeactions = newactions |
| 970 | 970 |
| 971 # premerge | 971 # premerge |
| 972 tocomplete = [] | 972 tocomplete = [] |
| 973 for f, args, msg in actions['m']: | 973 for f, args, msg in mergeactions: |
| 974 repo.ui.debug(" %s: %s -> m (premerge)\n" % (f, msg)) | 974 repo.ui.debug(" %s: %s -> m (premerge)\n" % (f, msg)) |
| 975 z += 1 | 975 z += 1 |
| 976 progress(_updating, z, item=f, total=numupdates, unit=_files) | 976 progress(_updating, z, item=f, total=numupdates, unit=_files) |
| 977 if f == '.hgsubstate': # subrepo states need updating | 977 if f == '.hgsubstate': # subrepo states need updating |
| 978 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), | 978 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), |