equal
deleted
inserted
replaced
151 |
151 |
152 return state |
152 return state |
153 |
153 |
154 def writestate(repo, state): |
154 def writestate(repo, state): |
155 """rewrite .hgsubstate in (outer) repo with these subrepo states""" |
155 """rewrite .hgsubstate in (outer) repo with these subrepo states""" |
156 lines = ['%s %s\n' % (state[s][1], s) for s in sorted(state)] |
156 lines = ['%s %s\n' % (state[s][1], s) for s in sorted(state) |
|
157 if state[s][1] != nullstate[1]] |
157 repo.wwrite('.hgsubstate', ''.join(lines), '') |
158 repo.wwrite('.hgsubstate', ''.join(lines), '') |
158 |
159 |
159 def submerge(repo, wctx, mctx, actx, overwrite): |
160 def submerge(repo, wctx, mctx, actx, overwrite): |
160 """delegated from merge.applyupdates: merging of .hgsubstate file |
161 """delegated from merge.applyupdates: merging of .hgsubstate file |
161 in working context, merging context and ancestor context""" |
162 in working context, merging context and ancestor context""" |