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

Re: Excel diff script (extended version)

From: Tommy Petersson <tommy_at_bogleboo.com>
Date: Mon, 2 Jul 2012 04:52:04 -0700 (PDT)

OK, thanks. Can this script be integrated with TFS?

Simon Large-6 wrote:
>
> On 2 July 2012 10:35, Tommy Petersson <tommy_at_bogleboo.com> wrote:
>> Hi,
>>
>> I found this in a Google search and I wonder if this can solve our
>> problem
>> (and how to implement it)?
>>
>> We need to be able to merge an Excel document including a VBA macro. At
>> the
>> moment we need to check out the document exclusively, make the changes,
>> run
>> the macro which creates 5 source files, build and test the program -
>> during
>> which time no-one else can change the Excel document. We need merge
>> functionality.
>>
>> We use Visual Studio and TFS, but diffMerge could be replaced with
>> TortoiseMerge, I guess. What else need to be done? caveats?
>
> The script you have referenced does not use TortoiseMerge at all.
> TMerge only works for text files. The script is just using Excel
> itself to do the merge, which is the only possible way since the file
> format is proprietary.
>
> Simon
>
>> kippspan wrote:
>>>
>>> I've finally gotten around to doing this simple little update. Here is
>>> the unified difference:
>>>
>>> Index: C:/Program Files/TortoiseSVN/Diff-Scripts/diff-xls.vbs
>>> ===================================================================
>>> --- C:/Program Files/TortoiseSVN/Diff-Scripts/diff-xls.vbs (revision
>>> 19)
>>> +++ C:/Program Files/TortoiseSVN/Diff-Scripts/diff-xls.vbs (revision
>>> 21)
>>> @@ -38,10 +38,8 @@
>>> 'Create a compare side by side view
>>>
>>> objExcelApp.Windows.CompareSideBySideWith(objExcelApp.Windows(2).Caption)
>>> If Err.Number <> 0 Then
>>> - objExcelApp.DisplayAlerts = False
>>> - objExcelApp.Quit()
>>> - Wscript.Echo "You must have Excel 2003 or later installed to use
>>> compare side-by-side feature."
>>> - Wscript.Quit 1
>>> + objExcelApp.Application.WindowState = xlMaximized
>>> + objExcelApp.Windows.Arrange(-4128)
>>> End If
>
> <snip large chunk of script>
>
> --
> : ___
> : oo // \\ "De Chelonian Mobile"
> : (_,\/ \_/ \ TortoiseSVN
> : \ \_/_\_/> The coolest Interface to (Sub)Version Control
> : /_/ \_\ http://tortoisesvn.net
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2974373
>
> To unsubscribe from this discussion, e-mail:
> [users-unsubscribe_at_tortoisesvn.tigris.org].
>
>

-- 
View this message in context: http://old.nabble.com/Excel-diff-script-%28extended-version%29-tp10187740p34101342.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2974376
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-07-02 13:54:18 CEST

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