On Wed, 2008-11-26 at 12:19 +0000, Julian Foad wrote:
> 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.
[...]
> > 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.
Oops, it was my skimpy testing that let it through.
Fixed in r34436.
Thanks.
- 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 19:44:21 CET