christian heimes wluhecheimesde martin v löwis schrieb seems recently number merges broke sense files added trunk merged 3k branch general problem svnmerge fixed automatically svn add merging changes included file additions removals sometimes happens svnmerge revert merge svn revert r second svnmerge files added first svnmerge arent added commit list second merge unfortunately svnmergepy doesnt warn file already exists christian _______________________________________________ pythondev mailing list zvlllneumpythonorg httpmailpythonorgmailmanlistinfopythondev unsubscribe httpmailpythonorgmailmanoptionspythondevpythondev40tangomucom wed 06 aug 2008 184229 0100 pythondev svnmerge added files