Show More
@@ -323,6 +323,7 b' def applyupdates(repo, action, wctx, mct' | |||||
323 | repo.ui.note(_("getting %s\n") % f) |
|
323 | repo.ui.note(_("getting %s\n") % f) | |
324 | t = mctx.filectx(f).data() |
|
324 | t = mctx.filectx(f).data() | |
325 | repo.wwrite(f, t, flags) |
|
325 | repo.wwrite(f, t, flags) | |
|
326 | t = None | |||
326 | updated += 1 |
|
327 | updated += 1 | |
327 | if f == '.hgsubstate': # subrepo states need updating |
|
328 | if f == '.hgsubstate': # subrepo states need updating | |
328 | subrepo.submerge(repo, wctx, mctx, wctx) |
|
329 | subrepo.submerge(repo, wctx, mctx, wctx) |
General Comments 0
You need to be logged in to leave comments.
Login now