On Wed, Jun 10, 2009 at 12:36:07AM -0700, David Goldsmith wrote: > OK, so the reconciliation is two-way, via SVN; I take it only registered > developers have update/commit privileges? Does at least one developer check > SVN at least once daily?
The way the web application works, is that it can generate standard diffs to SVN, using the 'patch' link, in the top bar. If you have commit rights on numpy, you can apply them. Also, it pulls the docstrings from the svn nightly. Any conflicts are tracked similarly to SVN, and are listed in the 'Merge' page, where you can resolve them, as you do in SVN. We should make you administrator of the web app fairly soon. Gaël _______________________________________________ Numpy-discussion mailing list [email protected] http://mail.scipy.org/mailman/listinfo/numpy-discussion
