Re: branching WC folder fails with files marked as deleted

On Wed, Jan 9, 2013 at 8:21 AM, Stefan Sperling <stsp_at_apache.org> wrote:

> Now, you might be wondering why I'm talking about renames rather than
> the deletion of an item, and how this still relates to your particular
> problem case. This is because Subversion generally cannot yet tell the
> difference between the following cases during conflict detection:
>
> svn mv A B
>
> and:
>
> svn copy A B
> svn rm A
>
> and:
>
> svn rm A

It's an awkward problem. I ran into intense screaming from someone
using "git2svn" when I did something like that in 2 different commits,
doing this:

         svn copy A B
         # Editing B to work in the new location
         svn commit B

and then, in a second commit, doing:

          svn rm A

Man, did they get upset. It cofused their tools to analyze and compare
change logs, which they expected to match in very fine detail between
the Subversion setup, and that person's own ocal git-svn setup. It was
analyzed correctly as two separate steps only when they hand-tuned
their git setup (I wish I remembered the exact details!)

I *do* hope that the new "svn mv" architecture will not be confused by this.

           svn cp A B
           svn cp A C
           scn cp A D
           svn rm A

That really is a different operation than an "svn mv", and it could be
tricky to detect and analyze correctly.
Received on 2013-01-09 14:53:10 CET