I took a heart and used Team->Merge... in subclipse - pretty intuitive:
===== File Statistics: =====
When trying to commit, I get:
commit -m "merged from trunk, up to revision 3263"
RA layer request failed
svn: Commit failed (details follow):
svn: COPY of test_poll.py: 403 Forbidden (https://svn.sourceforge.net)
So I must be doing something wrong ?
On 6/22/07, Oti <ohumbel@...> wrote:
> Frank and Charlie,
> up to now I did not realize that you both were merging my changes to
> the 2.3 branch, too (ignorant ant trunk focused I was...)
> THANK YOU VERY MUCH,
> this is a big relief, since it had been a lot of work !
> I have no experience with svn merge, so please excuse my question:
> Would there be conflicts for future mergers if I'd commit the latest
> small test changes of Alan and me by hand ?
> - modify Lib/test/output/test_socket
> - add Lib/test/test_poll.py
> thanks again,
> On 6/20/07, Frank Wierzbicki <fwierzbicki@...> wrote:
> > Merge from trunk to 2.3 is now done. Includes up to 3260. I believe
> > I got everything -- had to do some conflict resolution and avoid
> > double merges on a couple of files, but the same tests pass.
> > test_socket_ssl causes a problem -- but I expect that this is just
> > some roughness between the alpha branch and the new socket work from
> > Alan.
> > -Frank
> > -------------------------------------------------------------------------
> > This SF.net email is sponsored by DB2 Express
> > Download DB2 Express C - the FREE version of DB2 express and take
> > control of your XML. No limits. Just data. Click to get it now.
> > http://sourceforge.net/powerbar/db2/
> > _______________________________________________
> > Jython-dev mailing list
> > Jython-dev@...
> > https://lists.sourceforge.net/lists/listinfo/jython-dev