equal
deleted
inserted
replaced
321 elif m == "g": # get |
321 elif m == "g": # get |
322 flags = a[2] |
322 flags = a[2] |
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) |
329 elif m == "d": # directory rename |
330 elif m == "d": # directory rename |
330 f2, fd, flags = a[2:] |
331 f2, fd, flags = a[2:] |