Re: resolved not working

Dominik Guder wrote:

> Branko C(ibej schrieb:
>
>> Dominik Guder wrote:
>
>
>>> and after a merge of two branches:
>>> README.working, .merge-left.r5, .merge-right.r7
>>>
>>> after some tests I tried the svn cmndline: 'svn resolved' doesn't
>>> delete
>>> the conflict files too.
>>
>>
>>
>> Look again at "svn help resolved". A parameter is required.
>>
>>
> hmm... that's right, I'm sorry, with the expicit filename it worked
> find, but I had in mind that a 'svn resolved' also worked if I put a
> directory like '.' as parameter.

Yes, if you add the --recursive option. "svn resolved" is non-recursive
by default.

>
> So it seems that the ball goes back to TSVN
>
> regards Dominik

-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org