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.html#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
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2984538
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].