Mercurial > public > mercurial-scm > hg
diff mercurial/merge.py @ 30060:a145161debed
merge: use labels in subrepo merge
This is the last place that doesn't respect conflict labels in merge output.
Teach subrepos to use subrepo merge output too.
| author | Simon Farnsworth <simonfar@fb.com> |
|---|---|
| date | Sat, 08 Oct 2016 01:25:28 -0700 |
| parents | 6f447b9ec263 |
| children | 98d3d8108db0 |
line wrap: on
line diff
--- a/mercurial/merge.py Fri Oct 07 08:32:18 2016 -0400 +++ b/mercurial/merge.py Sat Oct 08 01:25:28 2016 -0700 @@ -1150,7 +1150,7 @@ numupdates = sum(len(l) for m, l in actions.items() if m != 'k') if [a for a in actions['r'] if a[0] == '.hgsubstate']: - subrepo.submerge(repo, wctx, mctx, wctx, overwrite) + subrepo.submerge(repo, wctx, mctx, wctx, overwrite, labels) # remove in parallel (must come first) z = 0 @@ -1168,7 +1168,7 @@ updated = len(actions['g']) if [a for a in actions['g'] if a[0] == '.hgsubstate']: - subrepo.submerge(repo, wctx, mctx, wctx, overwrite) + subrepo.submerge(repo, wctx, mctx, wctx, overwrite, labels) # forget (manifest only, just log it) (must come first) for f, args, msg in actions['f']: @@ -1253,7 +1253,7 @@ progress(_updating, z, item=f, total=numupdates, unit=_files) if f == '.hgsubstate': # subrepo states need updating subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), - overwrite) + overwrite, labels) continue audit(f) complete, r = ms.preresolve(f, wctx)