aboutsummaryrefslogtreecommitdiff
path: root/doc/todo/conflict_free_comment_merges.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-12-30 15:41:17 -0500
committerJoey Hess <joey@gnu.kitenet.net>2009-12-30 15:41:17 -0500
commit6af6c89df314cf2f9c9e053c04aa2bd492072ab1 (patch)
tree9f71ee2cd7654633052419bd4583ffe6cd052c8a /doc/todo/conflict_free_comment_merges.mdwn
parent9f841c07dff16433fce805111d8ab45ff38ce228 (diff)
downloadikiwiki-6af6c89df314cf2f9c9e053c04aa2bd492072ab1.tar
ikiwiki-6af6c89df314cf2f9c9e053c04aa2bd492072ab1.tar.gz
comments: Add a checksum to the name of comment pages, to avoid merge conflicts when comments are posted to two branches of a site.
Diffstat (limited to 'doc/todo/conflict_free_comment_merges.mdwn')
-rw-r--r--doc/todo/conflict_free_comment_merges.mdwn9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/todo/conflict_free_comment_merges.mdwn b/doc/todo/conflict_free_comment_merges.mdwn
index e0e8acb34..2cef0ee8c 100644
--- a/doc/todo/conflict_free_comment_merges.mdwn
+++ b/doc/todo/conflict_free_comment_merges.mdwn
@@ -12,3 +12,12 @@ title is specified, to retain the current behavior of the default title
being "comment N".
What do you think [[smcv]]? --[[Joey]]
+
+> I had to use md5sums, as sha1sum perl module may not be available and I
+> didn't want to drag it in. But I think that's ok; this doesn't need to be
+> cryptographically secure and even the chances of being able to
+> purposefully cause a md5 collision and thus an undesired merge conflict
+> are quite low since it modifies the input text and adds a date stamp to
+> it.
+>
+> Anyway, I think it's good, [[[done]] --[[Joey]]