Re: [Issue 3320] Commit not blocked by tree conflict

julianfoad_at_tigris.org wrote:
> http://subversion.tigris.org/issues/show_bug.cgi?id=3320
>
>
>
> User julianfoad changed the following:
>
> What |Old value |New value
> ================================================================================
> Keywords| |tree-conflicts
> --------------------------------------------------------------------------------
> Priority|P3 |P2
> --------------------------------------------------------------------------------
> Target milestone|--- |1.6
> --------------------------------------------------------------------------------
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: issues-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: issues-help_at_subversion.tigris.org
>

Hey tree-conflicts folks,

I just ran the script from the mail linked to by this issue, and, where the
mail says:

[[[
$ # In branch B's WC

$ svn merge file:///home/julianfoad/tmp/svn/uc4/repos/A
--- Merging r2 through r4 into '.':
   C Foo.c
Summary of conflicts:
  Tree conflicts: 1
]]]

Current trunk says:
[[[
+ cd B
+ svn merge file:////arch/hg/svn-tc/test/repos/A
Skipped missing target: 'Foo.c'
]]]

I guess it's because of Stephens removal of missing targets (IIRC). And, I
guess this is bad: all merges onto a moved file are skipped, not marked
conflicted. Isn't that the second most common case in Java refactoring?

And, secondly, should we try to reproduce the error the issue describes in a
different way? (The commit that is allowed despite a conflict.) I can't find
one at the moment.

~Neels