summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/todo/review_mechanism.mdwn15
1 files changed, 14 insertions, 1 deletions
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]]