Show More
@@ -45,6 +45,7 b' def writestate(repo, state):' | |||
|
45 | 45 | for s in sorted(state)]), '') |
|
46 | 46 | |
|
47 | 47 | def submerge(repo, wctx, mctx, actx): |
|
48 | # working context, merging context, ancestor context | |
|
48 | 49 | if mctx == actx: # backwards? |
|
49 | 50 | actx = wctx.p1() |
|
50 | 51 | s1 = wctx.substate |
@@ -105,7 +106,7 b' def submerge(repo, wctx, mctx, actx):' | |||
|
105 | 106 | continue |
|
106 | 107 | elif s not in sa: |
|
107 | 108 | debug(s, "remote added, get", r) |
|
108 |
|
|
|
109 | mctx.sub(s).get(r) | |
|
109 | 110 | sm[s] = r |
|
110 | 111 | elif r != sa[s]: |
|
111 | 112 | if repo.ui.promptchoice( |
General Comments 0
You need to be logged in to leave comments.
Login now