Show More
@@ -986,13 +986,20 b' def applyupdates(repo, actions, wctx, mc' | |||
|
986 | 986 | f1, f2, fa, move, anc = args |
|
987 | 987 | if f == '.hgsubstate': # merged internally |
|
988 | 988 | continue |
|
989 | repo.ui.debug(" preserving %s for resolve of %s\n" % (f1, f)) | |
|
990 | fcl = wctx[f1] | |
|
991 | fco = mctx[f2] | |
|
989 | if f1 is None: | |
|
990 | fcl = filemerge.absentfilectx(wctx, fa) | |
|
991 | else: | |
|
992 | repo.ui.debug(" preserving %s for resolve of %s\n" % (f1, f)) | |
|
993 | fcl = wctx[f1] | |
|
994 | if f2 is None: | |
|
995 | fco = filemerge.absentfilectx(mctx, fa) | |
|
996 | else: | |
|
997 | fco = mctx[f2] | |
|
992 | 998 | actx = repo[anc] |
|
993 | 999 | if fa in actx: |
|
994 | 1000 | fca = actx[fa] |
|
995 | 1001 | else: |
|
1002 | # TODO: move to absentfilectx | |
|
996 | 1003 | fca = repo.filectx(f1, fileid=nullrev) |
|
997 | 1004 | ms.add(fcl, fco, fca, f) |
|
998 | 1005 | if f1 != f and move: |
General Comments 0
You need to be logged in to leave comments.
Login now