Show More
| @@ -379,8 +379,8 b' def update(repo, node, branchmerge=False' | |||||
| 379 |
|
379 | |||
| 380 | # update dirstate |
|
380 | # update dirstate | |
| 381 | if not partial: |
|
381 | if not partial: | |
|
|
382 | recordupdates(repo, action, branchmerge) | |||
| 382 | repo.dirstate.setparents(p1.node(), p2.node()) |
|
383 | repo.dirstate.setparents(p1.node(), p2.node()) | |
| 383 | recordupdates(repo, action, branchmerge) |
|
|||
| 384 |
|
384 | |||
| 385 | if show_stats: |
|
385 | if show_stats: | |
| 386 | stats = ((updated, _("updated")), |
|
386 | stats = ((updated, _("updated")), | |
General Comments 0
You need to be logged in to leave comments.
Login now