Neels J Hofmeyr wrote:
> I found that the TC URL_at_REV info from a merge conflict only prints the
> target URLs, omitting the recursed-into portions of it.
>
> See the output of the attached script, using any of
> ./java-refactor.sh.txt 2
> ./java-refactor.sh.txt 3
> ./java-refactor.sh.txt 4
> ./java-refactor.sh.txt 5
> , which looks like:
>
> [[[
> ---- variant four, merge branch to trunk as-is, accept theirs.
> + svn merge file:////arch/hg/svn-tc/test/repos/branch trunk/
> --- Merging r2 through r3 into 'trunk':
> C trunk/com/yoyodyne
> Summary of conflicts:
> Tree conflicts: 1
> + svn st
> M trunk
> ! C trunk/com/yoyodyne
> > local delete, incoming edit upon merge
> + svn info trunk/com/yoyodyne
> Path: trunk/com/yoyodyne
> Name: yoyodyne
> Node Kind: none
> Tree conflict: local delete, incoming edit upon merge
> Source left: (dir) file:///.../repos/trunk_at_1
> Source right: (dir) file:///.../repos/branch_at_3
> ]]]
>
> It's supposed to print
> [[[
> Source left: (dir) file:///.../repos/trunk/com/yoyodyne_at_1
> Source right: (dir) file:///.../repos/branch/com/yoyodyne_at_3
> ]]]
> , including the portions below the target URL, right?
Yes, you are right.
I've mentioned this in the issue (#3322) but am not investigating yet.
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-26 13:13:29 CET