Re: svn commit: r34091 - in trunk: . notes/tree-conflicts subversion/include subversion/include/private subversion/libsvn_auth_kwallet subversion/libsvn_client subversion/libsvn_subr subversion/tests/cmdline subversion/tests/libsvn_subr tools/buildbo

On Fri, Nov 7, 2008 at 9:21 AM, C. Michael Pilato <cmpilato_at_collab.net> wrote:
> Paul Burba wrote:
>> Reintegrate failed but not in the way expected
>> EXPECTED STDOUT (regexp):
>> (svn: Reintegrate can only be used if the revisions previously merged
>> from the reintegrate target to '.*A_COPY' are the same, but there are
>> differences:
>> )|( A_COPY
>> )|( /A:2-12
>> )|( A_COPY/D
>> )|( /A/D:2-7,9-12
>> )|(
>> )
>> ACTUAL STDOUT:
>> subversion/libsvn_client/merge.c:7226: (apr_err=195016)
>> svn: Reintegrate can only be used if the revisions previously merged
>> from the reintegrate target to
>> 'svn://127.0.0.1:1295/svn-test-work/repositories/merge_tests-126/A_COPY'
>> are the same, but there are differences:
>> A_COPY
>> /A:2-12
>> A_COPY/D
>> /A/D:2-7,9-12
>>
>
> Could it be because of this bit of the error output?
>
> subversion/libsvn_client/merge.c:7226: (apr_err=195016)

It's a miracle! I can see now, you've cured me! :-\ Fixed in r34094.

Thanks,

Paul

---------------------------------------------------------------------
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-07 16:07:28 CET