mike klaas xdihqxzrsgmailcom 20mar08 232 pm christian heimes wrote 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 may warn explicitly certainly warn skipped pathtomissingfile someone deals svnmergepy lot find appropriate treat skipped critical conflict wish explicit respect mike _______________________________________________ pythondev mailing list zvlllneumpythonorg httpmailpythonorgmailmanlistinfopythondev unsubscribe httpmailpythonorgmailmanoptionspythondevpythondev40tangomucom wed 06 aug 2008 104602 0700 pythondev svnmerge added files