Show More
| @@ -380,7 +380,7 b' def update(repo, node, branchmerge=False' | |||||
| 380 | p1, p2 = p2, repo.changectx(nullid) |
|
380 | p1, p2 = p2, repo.changectx(nullid) | |
| 381 |
|
381 | |||
| 382 | xp1, xp2 = str(p1), str(p2) |
|
382 | xp1, xp2 = str(p1), str(p2) | |
| 383 |
if p2 |
|
383 | if not p2: xp2 = '' | |
| 384 |
|
384 | |||
| 385 | repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) |
|
385 | repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) | |
| 386 |
|
386 | |||
General Comments 0
You need to be logged in to leave comments.
Login now