Re: resolved not working

Dominik Guder wrote:

> Hi,
>
> -------- Ursprüngliche Nachricht --------
> Betreff: resolved issue since 0.19
> Datum: Mon, 27 Oct 2003 21:14:35 +0100
> Von: Dominik Guder <osc@guder.org>
> Rückantwort: dev@tortoisesvn.tigris.org
> An: dev@tortoisesvn.tigris.org
>
> Hi folks,
>
> at work I discovered an issue regaring the 'resolved' menu of TSVN
> It doesn't work neither in 0.19 at work nor in 0.21 at home.
>
> the conflict files:
> after a update at the same trunk:
> README.mine, .r2, .r3
> 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.

-- 
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