[Python-Dev] svnmerge and added files

[Mike Klaas]

On 20-Mar-08, at 2:32 PM, Christian Heimes wrote:

> 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.

It may not warn explicitly about that, but it certainly does warn:

M ...
Skipped path/to/missing/file...
M ...
M ...

As someone who deals with svnmerge.py a lot, I find that it is  
appropriate to treat "Skipped" as critical as a conflict.

I too wish that it was more explicit in this respect.
-Mike