On 12 July 2012 21:51, Harlan Ray Mosley <hmosley_at_e-mds.com> wrote:
> 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?
First of all please don't even think about sending a 224MB file to a
public mailing list.
Secondly I think you misunderstand Stefan. He is not offering to do
the merge for you. The only tools that can merge TestComplete files is
TestComplete itself as nothing else will understand the file format.
So you have to work out how to do the merge. Maybe you could try
contacting TestComplete support as it is a commercial product, or
maybe they have a forum?
What Stefan is offering, once you have worked out how to do the merge,
is the ability to link that back into TortoiseSVN to mark files as
resolved or conflicted depending on the merge result.
Also, please don't top-post. It makes it much harder to follow the
flow of the conversation.
> 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>
> 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
> 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.
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-07-13 10:45:08 CEST