christian heimes wluhecheimesde facundo batista schrieb thought trunk 3k merge easier sometimes commited changes trunk dont worrying 3k thinking mostly automatic process know start patching trunk 3k simultaneously cases easy usually takes less 20 minutes per day merge chances trunk py3k particular case several obstacles come together changes ast parser code arent trivial im familiar internals ast parser code free time limited please dont patch trunk py3k simultaneously may confuse svn may make future merges harder apply patch trunk either merge block revision svnmerge example commit patch trunk cd pythontrunk trunk svn ci message committed revision 1234 merge revision py3k branch trunk cd py3k py3k svnmergepy merge r 1234 resolve conflicts commit merge py3k svn ci f svnmergecommitmessagetxt christian _______________________________________________ pythondev mailing list zvlllneumpythonorg httpmailpythonorgmailmanlistinfopythondev unsubscribe httpmailpythonorgmailmanoptionspythondevpythondev40tangomucom thu 07 aug 2008 055245 0200 pythondev time svn merge