[Svnmerge] Bugs when merging revisions that modify and deletefiles

[Blair Zajac]

Giovanni Bajo wrote:
> Blair Zajac <blair at orcaware.com> wrote:
> 
> 
>>I do think that svnmerge.py should catch the 'Skipping..' message
>>from 'svn merge' and present a large warning to the user at the end
>>of the run.  It's too easy to do a huge merge and miss this message
>>and end up with a bad merge.  The message at the end can also
>>recommend to use the yet to be implemented --force option to
>>svnmerge.py.
> 
> 
> 
> Any reason why we shouldn't just always use "svn merge --force"? We already
> checked the working copy is clean beforehand.

Not off hand.  But let me look at the code to make sure we know what it does 
before we use it by default.

Blair