Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / todo / review_mechanism.mdwn

diff --git a/doc/todo/review_mechanism.mdwn b/doc/todo/review_mechanism.mdwn
index 13fc248e2ba06f41937ef87982f680c2ffe5ecf8..66ed581444c9e4d5d6770ea61898aa1166b35540 100644 (file)
--- 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]]);
 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]]