Show More
| @@ -412,8 +412,7 b' def update(repo, node, branchmerge, forc' | |||||
| 412 | repo.dirstate.setparents(fp1, fp2) |
|
412 | repo.dirstate.setparents(fp1, fp2) | |
| 413 | repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) |
|
413 | repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) | |
| 414 | if not branchmerge: |
|
414 | if not branchmerge: | |
| 415 | print "yow!" |
|
415 | repo.opener("branch", "w").write(p2.branch() + "\n") | |
| 416 | repo.opener("branch", "w").write(p1.branch() + "\n") |
|
|||
| 417 |
|
416 | |||
| 418 | return stats |
|
417 | return stats | |
| 419 |
|
418 | |||
General Comments 0
You need to be logged in to leave comments.
Login now