Show More
@@ -79,9 +79,8 b' def state(ctx, ui):' | |||||
79 |
|
79 | |||
80 | def writestate(repo, state): |
|
80 | def writestate(repo, state): | |
81 | """rewrite .hgsubstate in (outer) repo with these subrepo states""" |
|
81 | """rewrite .hgsubstate in (outer) repo with these subrepo states""" | |
82 | repo.wwrite('.hgsubstate', |
|
82 | lines = ['%s %s\n' % (state[s][1], s) for s in sorted(state)] | |
83 | ''.join(['%s %s\n' % (state[s][1], s) |
|
83 | repo.wwrite('.hgsubstate', ''.join(lines), '') | |
84 | for s in sorted(state)]), '') |
|
|||
85 |
|
84 | |||
86 | def submerge(repo, wctx, mctx, actx, overwrite): |
|
85 | def submerge(repo, wctx, mctx, actx, overwrite): | |
87 | """delegated from merge.applyupdates: merging of .hgsubstate file |
|
86 | """delegated from merge.applyupdates: merging of .hgsubstate file |
General Comments 0
You need to be logged in to leave comments.
Login now