RE: TortoiseSVN and TestComplete

I did try to see if anything had been posted about TestComplete on the
user forum before I posted the question again.

I have used 7-zip to create a 224MB zip file (.7z) that contains the two
projects we need merged, and a file we used as the string we append to
the SVN global ignore list. When I tried to attach it to this email, it
got the exceeds max size message. How do you suggest I get this .7z
file to you?

Thanks very much.

From: Stefan Fuhrmann [mailto:stefan.fuhrmann_at_wandisco.com]
Sent: Thursday, July 12, 2012 4:01 AM
To: dev
Cc: ray.mosley_at_gmail.com; Harlan Mosley
Subject: Re: TortoiseSVN and TestComplete

On Wed, Jul 11, 2012 at 9:19 PM, Harlan Ray Mosley <hmosley_at_e-mds.com>
wrote:

My company uses TestComplete to generate and execute regression tests.
My co-worker and I have working copies of the same project, and can
resolve differences in ASCII test files such as our jscript scripts.
The issue where we have had REAL trouble in the past is merging
peripheral files, such as NameMapping (refers to objects of app being
tested), objects, project suite files, and project files, and others -
TestApps & project items and which project items are selected, etc. In
short, the merge issue is much more serious than merging source code
files.

Yes, project files can be real PITA creating unnecessary conflicts
(Visual Studio anyone?).
 

         Has any user out their a suggestion of how to merge projects &
project files of this type?

Maybe, you should be looking for users on the users list ;)

It is clear that the kinds of conflicts you are talking about requires
tool / file type specific
conflict resolution code. TSVN does support per-file-type diff & merge
tool selection
(http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-dug-settings.ht
ml#tsvn-dug-settings-progs)

So far these tools will be invoked for displaying & editing changes and
conflicts. If you could
provide a few scripts that attempt to resolve typical conflicts, we
could add an "attempt
auto-resolve" feature to TSVN that would invoke registered conflict
resolution scripts
on those files and mark the conflicts as resolved depending on the
script's return value.

-- Stefan^2.

-- 
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download
******************************************************************************************************************************************************
This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to which they are addressed. If you have received this email in error please notify the system manager. This footnote also confirms that this email message has been checked for viruses with Microsoft Forefront anti-virus software. In addition, e-MDs, Inc. strongly discourages sending any form of confidential patient information as defined by HIPAA in the form of text, screen shots, or other formats via email messages. 
******************************************************************************************************************************************************
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2985143
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].