Show More
@@ -719,6 +719,12 b' def update(repo, node, branchmerge, forc' | |||
|
719 | 719 | "subrepository '%s'") % s) |
|
720 | 720 | |
|
721 | 721 | elif not overwrite: |
|
722 | if p1 == p2: # no-op update | |
|
723 | # call the hooks and exit early | |
|
724 | repo.hook('preupdate', throw=True, parent1=xp2, parent2='') | |
|
725 | repo.hook('update', parent1=xp2, parent2='', error=0) | |
|
726 | return 0, 0, 0, 0 | |
|
727 | ||
|
722 | 728 | if pa not in (p1, p2): # nolinear |
|
723 | 729 | dirty = wc.dirty(missing=True) |
|
724 | 730 | if dirty or onode is None: |
General Comments 0
You need to be logged in to leave comments.
Login now