[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: Branko Čibej <brane_at_xbc.nu>
Date: 2003-10-28 08:48:03 CET

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
Received on Tue Oct 28 08:48:55 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.