summaryrefslogtreecommitdiff
path: root/IkiWiki/Rcs
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-02-14 16:10:33 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-02-14 16:10:33 -0500
commit1c06aed378e579b7396937fdff4e38ea0482ff5b (patch)
tree75213d0c600e1733030cf154d8268f7692ecd33a /IkiWiki/Rcs
parent8f7d7c1a00d65fcdb1482f5e8ce334be752c3db4 (diff)
* monotone: Add code to default mergerc file to run
_MTN/ikiwiki-netsync-hook when a commit is merged in from the net.
Diffstat (limited to 'IkiWiki/Rcs')
-rw-r--r--IkiWiki/Rcs/monotone.pm5
1 files changed, 5 insertions, 0 deletions
diff --git a/IkiWiki/Rcs/monotone.pm b/IkiWiki/Rcs/monotone.pm
index c4a6d9864..6a156892a 100644
--- a/IkiWiki/Rcs/monotone.pm
+++ b/IkiWiki/Rcs/monotone.pm
@@ -136,6 +136,11 @@ sub check_mergerc () { #{{{
debug("$mergerc doesn't exist. Creating file with default mergers.");
open (my $out, ">", $mergerc) or error("can't open $mergerc: $!");
print $out <DATA>;
+ print $out <<"EOF";
+ function note_netsync_revision_received(new_id, revision, certs, session_id)
+ execute("$config{mtnrootdir}/_MTN/ikiwiki-netsync-hook", new_id)
+ end
+EOF
close $out;
}
} #}}}