[Svnmerge] Bugs when merging revisions that modify and deletefiles

[Giovanni Bajo]

Archie Cobbs <archie at dellroad.org> wrote:

> Perhaps the answer is to always use "--force" when invoking
> svn merge (at least, for the second and subsequent invocations):
>
>    - If the user did not say "svnmerge merge --force", then we know
>      the working copy is clean (because we wouldn't have proceeded if
>      not), and so any uncleanliness must be a result of a situation
>      like this where --force is what we really want (*)
>
>    - If the user said "svnmerge merge --force" then that's what
>      (s)he wanted anyway.
>
> First we'd have to think hard to make sure (*) is really true...


I'm kind of agreeing with your reasoning. To have a better picture, it would
help to know what "svn merge --force" exactly does.

Giovanni Bajo