FW: BUG: incorrect and misleading behaviour of revert on directories

Hello,

The message send below has not appeared on the mailing list yet.
In case the message was bounce because of the 65KB of attachments
(only 43KB before the attaching), I am posting again without the
GIF files. I have left the scripts zip attached.

Rob.

-----Original Message-----
From: Rob Hubbard
Sent: 27 November 2008 14:38
To: 'users_at_tortoisesvn.tigris.org'
Subject: BUG: incorrect and misleading behaviour of revert on
directories

Hello,

I am not subscribed to this mailing list,
so it would be helpful if you could copy me directly
(as well as the mailing list) on any replies.
Thanks.

I think both SVN and TortoiseSVN are great tools.
Unfortunately, I have found a bug in T-SVN.

--
Suppose that, following a merge (or update),
a directory has both a conflicting file
and a conflicting property.
For example (here with the command-line client SVN):
	robh_at_robhxp /cygdrive/c/Rob/wc/experimental/svn/trb_wc
	$ svn status trunk
	 C     trunk
	?      trunk\dir_conflicts.prej
	?      trunk\file.txt.merge-left.r3
	?      trunk\file.txt.merge-right.r4
	?      trunk\file.txt.working
	C      trunk\file.txt
When you try to resolve just the directory,
TortoiseSVN will also resolve the file.
TortoiseSVN does not make the path of the file obvious either.
To reproduce, either:
	- TortoiseSVN (on trunk) | check for modifications
	- resolved (on trunk)
or:
	- TortoiseSVN (on trunk) | resolved
then:
	- clear the tickbox for the file
	- click the OK button
See the attached sequence of dialogs:
[These are not attached to this resend.]
	<tsvn_resolve_bug_dialog0.gif>
		- Working Copy (Modifications)
		- NB: shows "trunk" as "trunk" rather than "."
	<tsvn_resolve_bug_dialog1.gif>
		- Resolve
		- showing that file.txt was deselected 
	<tsvn_resolve_bug_dialog2.gif>
		- Finish!
		- showing the unexpected result
See also the attached scripts (for either DOS or Cygwin/Bash):
	<tsvn_resolve_bug.bat>
	<tsvn_resolve_bug.sh>
	[zipped in case my mail client blocks them]
these scripts set up a small repository and working copy,
using the SVN command-line client version 1.5.3 (not quite the latest),
ready to demonstrate the problem.
Hopefully these will help in demonstrating and investigating the
problem.
*Please check through these scripts yourself before running them.*
They assume the existence of C:/Temp on Windoze.
They (delete and) create some files and directories.
This problem was produced with the latest T-SVN version:
	TortoiseSVN 1.5.5, Build 14361 - 32 Bit , 2008/10/24 18:06:34
	Subversion 1.5.4,
	apr 1.2.12
	apr-utils 1.2.12
	berkeley db 4.4.20
	neon 0.28.3
	OpenSSL 0.9.8i 15 Sep 2008
	zlib 1.2.3
Here is the command-line client behaviour, which is correct:
	robh_at_robhxp /cygdrive/c/Rob/wc/experimental/svn/trb_wc
	$ svn resolve trunk/ --accept working
	Resolved conflicted state of 'trunk'
	robh_at_robhxp /cygdrive/c/Rob/wc/experimental/svn/trb_wc
	$ svn st
	 M     trunk
	?      trunk\file.txt.merge-left.r3
	?      trunk\file.txt.merge-right.r4
	?      trunk\file.txt.working
	C      trunk\file.txt
The T-SVN behaviour seems to match that of the command-line client
with the --recursive switch.
Thanks,
Rob.
________________________________________________________________
This message has been independently scanned for the Softel Group and cleared of containing viruses and other malicious data.
Powering Television Beyond the Video (TM)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org