[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: resolved not working

From: Dominik Guder <osc_at_guder.org>
Date: 2003-10-28 05:59:26 CET

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.

So it seems that the ball goes back to TSVN

regards Dominik

Maintainer German Banktransfer
Support unter www.oscommerce.de
The answer to the great question of life,
the universe and everything is 42 (Douglas Adams)
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 28 06:00:19 2003

This is an archived mail posted to the Subversion Dev mailing list.