[Python-Dev] svnmerge and added files
lists at cheimes.de
Thu Mar 20 22:32:21 CET 2008
Martin v. Löwis schrieb:
> It seems that recently, a number of merges broke in the sense
> that files added to the trunk were not merged into the
> 3k branch.
> Is that a general problem with svnmerge? Should that be
> fixed to automatically do a "svn add" when merging changes
> that included file additions and removals?
It sometimes happens when I do a svnmerge, revert the merge with svn
revert -R and do a second svnmerge. Files added by the first svnmerge
aren't added to the commit list for the second merge. Unfortunately
svnmerge.py doesn't warn me when the file already exists.
More information about the Python-Dev