web commit by http://jeremie.koenig.myopenid.com/: sanitize(concisify(update(filter...

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

diff --git a/doc/todo/review_mechanism.mdwn b/doc/todo/review_mechanism.mdwn
index 13fc248e2ba06f41937ef87982f680c2ffe5ecf8..03c0fa749d035874debacf3281936c8c278b7982 100644 (file)
--- a/doc/todo/review_mechanism.mdwn
+++ b/doc/todo/review_mechanism.mdwn
@@ -17,4 +17,19 @@ 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]]
+
+[[tag wishlist]]