Show More
@@ -2229,7 +2229,9 b' def _update(' | |||
|
2229 | 2229 | util.unlink(repo.vfs.join(b'updatestate')) |
|
2230 | 2230 | |
|
2231 | 2231 | if not branchmerge: |
|
2232 |
repo.dirstate.setbranch( |
|
|
2232 | repo.dirstate.setbranch( | |
|
2233 | p2.branch(), repo.currenttransaction() | |
|
2234 | ) | |
|
2233 | 2235 | |
|
2234 | 2236 | # If we're updating to a location, clean up any stale temporary includes |
|
2235 | 2237 | # (ex: this happens during hg rebase --abort). |
General Comments 0
You need to be logged in to leave comments.
Login now