[PATCH] merge: call update hook afer writing dirstate
Simon Heimberg
simohe at besonet.ch
Wed May 27 07:20:20 CDT 2009
# HG changeset patch
# User Simon Heimberg <simohe at besonet.ch>
# Date 1243412546 -7200
# Node ID 672ab0cc22d3cab65c3143df38b976a6c1a32abb
# Parent ff313d68dccff72e8a36999a08492adccdfe9ddf
merge: call update hook afer writing dirstate
this is what is documented in hgrc.5.txt
diff -r ff313d68dccf -r 672ab0cc22d3 mercurial/merge.py
--- a/mercurial/merge.py Mit Mai 13 19:47:34 2009 +0200
+++ b/mercurial/merge.py Mit Mai 27 10:22:26 2009 +0200
@@ -497,8 +497,11 @@
repo.dirstate.setparents(fp1, fp2)
if not branchmerge and not fastforward:
repo.dirstate.setbranch(p2.branch())
- repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
- return stats
finally:
wlock.release()
+
+ if not partial:
+ repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
+
+ return stats
More information about the Mercurial-devel
mailing list