On 05/04/2008, Charles R Harris <[EMAIL PROTECTED]> wrote: > On Sat, Apr 5, 2008 at 4:10 PM, Anne Archibald <[EMAIL PROTECTED]> > wrote: > > More generally, my local working copy is now rater divergent from the > > upstream. What's the recommended way to deal with this? Make sure I > > have all the patches submitted to trac, then just revert to raw SVN? > > So far I've just been editing the output of svn diff down to only the > > bit that's relevant to each patch, but it's getting pretty long. > > Do you have commit access now? You could pull a fresh copy of svn, apply > your patches one by one, and commit each time. That way you can avoid > conflicts, which can be a pain when your local copy has diverged a lot from > upstream. Lots of small commented changes are also preferable to one big > patch.
No, or at least, I don't know a username/password to use. I also don't seem to be able to change the status of bugs on the trac. Anne _______________________________________________ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion
