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

[TSVN] TortoiseSVN does not let you resolve conflicted directories

From: Butt Dyno <buttdyno_at_gmail.com>
Date: 2005-06-13 16:11:32 CEST

TortoiseSVN 1.1.6
Windows XP

We had a situation where the svn:externals property was in conflict,
and as such the two directories (not their contents) were in conflict.

Tortoise did not give us the option to resolve the directory, even
though it showed up as conflicted. We had to go in with the command
line to run "svn resolved" by hand.

Probably just a small omission, maybe already fixed. Just letting you
guys know. Thanks for a solid product.

John

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jun 13 17:45:02 2005

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

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