equal
deleted
inserted
replaced
409 |
409 |
410 if not partial: |
410 if not partial: |
411 recordupdates(repo, action, branchmerge) |
411 recordupdates(repo, action, branchmerge) |
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: |
|
415 print "yow!" |
|
416 repo.opener("branch", "w").write(p1.branch() + "\n") |
414 |
417 |
415 return stats |
418 return stats |
416 |
419 |