No, I don't think I can recover the changes. Would it work to just copy the files over from the sandbox, forcing Lib/email in the py3k branch to be identical to emailpkg/5_0-exp/email in the sandbox?
On 8/29/07, Guido van Rossum <[EMAIL PROTECTED]> wrote: > On 8/29/07, Barry Warsaw <[EMAIL PROTECTED]> wrote: > > Guido, do you remember which revision from the sandbox you merged/ > > copied? It looks like it was missing some stuff I committed last > > night. If you know which revision you merged it'll make it easy for > > me to copy the latest stuff over. Sadly I did not use svnmerge. :( > > > > OTOH, if you get to it before I do, the sandbox branch is now > > completely up-to-date with all my changes. It needs to be merged to > > the head of the py3k trunk and then I can kill the sandbox branch. > > Ouch, I didn't make a note of that. I misunderstood how svn copy > worked, and assumed it would copy the latest revision -- but it copied > my working copy. Fortunately I had done a sync not too long ago. > > I think I can reconstruct the diffs and will apply them manually to > the py3k branch, then you can erase the sandbox. > > -- > --Guido van Rossum (home page: http://www.python.org/~guido/) > -- --Guido van Rossum (home page: http://www.python.org/~guido/) _______________________________________________ Python-3000 mailing list Python-3000@python.org http://mail.python.org/mailman/listinfo/python-3000 Unsubscribe: http://mail.python.org/mailman/options/python-3000/archive%40mail-archive.com
