From: joey Date: Wed, 8 Aug 2007 14:07:21 +0000 (+0000) Subject: web commit by JoshTriplett: Some of this works already. X-Git-Tag: 2.6~205 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a8db6caf47263fd717d6ac375dbb7c0e2f11cf21;p=ikiwiki.git web commit by JoshTriplett: Some of this works already. --- diff --git a/doc/todo/review_mechanism.mdwn b/doc/todo/review_mechanism.mdwn index 13fc248e2..f02e11548 100644 --- a/doc/todo/review_mechanism.mdwn +++ b/doc/todo/review_mechanism.mdwn @@ -17,4 +17,17 @@ Each change would have its own wiki page under changes/revNNNN. Change queues would be wiki pages as well (probably using [[inlines|plugins/inline]]); [[Pagespecs|Pagespec]] and [[tags]] would be used to control the queues to which a given change would belong. ---[[JeremieKoenig]] \ No newline at end of file +--[[JeremieKoenig]] + +> You can achieve something like this right now, by using Git. The +> development and published versions each have their own repository, with +> remotes set up so they push either to two backend repositories or to two +> different branches of the same backend repository. You can then merge from +> one to the other whenever you want. +> +> You could theoretically do this with SVN as well. +> +> I do like the idea you suggest of reviewing and merging changes through the +> web interface, though. +> +> -- [[JoshTriplett]]