X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/423f4aedbdce45ee995bab8dc94b88ad68890981..5c7771e01aafb7b2e197f58a725132e4c2f4bde8:/doc/todo/review_mechanism.mdwn?ds=sidebyside diff --git a/doc/todo/review_mechanism.mdwn b/doc/todo/review_mechanism.mdwn index 13fc248e2..66ed58144 100644 --- a/doc/todo/review_mechanism.mdwn +++ b/doc/todo/review_mechanism.mdwn @@ -15,6 +15,21 @@ This would be done in a way that would trigger the appropriate VCS merge operati A generic "change queue" mechanism could be used for translations or other stuff as well. 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. +[[Pagespecs|ikiwiki/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]] + +[[!tag wishlist]]