WinMerge 2011 is now at Bitbucket

Open discussion about WinMerge.

Re: WinMerge 2011

Postby nitnit » Mon Nov 28, 2011 6:48 pm

This usually happens when Frhed is not installed. 64-bit should be no problem.


I have it installed in a directory created by me (didn't use the setup, just unzipped the archive) and winmerge doesn't recognize it. Do I have to install it in a certain directory ?
nitnit
 
Posts: 10
Joined: Mon Jul 25, 2011 5:55 am

Re: WinMerge 2011

Postby jtuc » Mon Nov 28, 2011 10:32 pm

nitnit wrote:didn't use the setup
That's why it doesn't work. The heksedit.dll (or hekseditU.dll) must be registered. If you don't want to run the setup you can use regsvr32.
jtuc
Developer
 
Posts: 182
Joined: Sat Dec 20, 2008 11:05 am

Re: WinMerge 2011 is now at Bitbucket

Postby wm2011abc » Sun Dec 18, 2011 11:25 pm

I just downloaded the latest listed version, and I cannot expand the small File Open dialog. It has a symbol on the lower right corner that appears to indicate it should be enlargeable, but I can't seem to click and actually enlarge it. Should this work, or is this a known issue, or... ?

Version 0.2011.001.497



Never mind:

I just noticed the instructions in the first post of this thread, directing bug submissions to a tracker, so I posted this bug report at that tracker: https://bitbucket.org/jtuc/winmerge2011/issue/1/cant-expand-open-file-dialog
wm2011abc
 
Posts: 1
Joined: Sun Dec 18, 2011 11:24 pm

Re: WinMerge 2011 is now at Bitbucket

Postby tahattmeruh » Tue Dec 20, 2011 5:11 pm

Can you also improve the compare algorithm?
I often have source code where I have to insert an
if then else block around some lines of code.

e.g. copy both codes in two files and compare them.

Code: Select all
If a = b then
    msgbox "test1"
    msgbox "test2"
    msgbox "test3"
    msgbox "test4"
    msgbox "test5"
end if


Code: Select all
msgbox "test1"
msgbox "test2"
msgbox "test3"
msgbox "test4"
msgbox "test5"


I would expect to get the two new lines marked and the spaces at the beginning.
tahattmeruh
 
Posts: 1
Joined: Tue Mar 29, 2011 8:26 am

Re: WinMerge 2011 is now at Bitbucket

Postby jtuc » Tue Dec 20, 2011 9:41 pm

tahattmeruh wrote:Can you also improve the compare algorithm?

Substantial changes to diff algorithm won't happen.

tahattmeruh wrote:I would expect to get the two new lines marked and the spaces at the beginning.

Read here about existing support for ignoring whitespace:

http://manual.winmerge.org/Configuration.html

    3. Compare page

      3.2. Whitespace

This doesn't exactly fit your expectations, but still helps with the situation.
jtuc
Developer
 
Posts: 182
Joined: Sat Dec 20, 2008 11:05 am

How line filters can act as prediffers

Postby jtuc » Sat Mar 31, 2012 8:06 am

The screenshot below shows a line filter that would cause line numbers in .nc files to be ignored, essentially resembling the functionality of WinMerge 2's IgnoreLeadingLineNumbers.dll. The feature makes use of a capturing regular expression, and removes from each line that matches it all parts of the match which are covered by a captured submatch, before passing the line down to the diff algorithm.

Additional support for scriptlets will help in situations where the expressiveness of regular expressions is insufficient.

Image

Below shown scriptlet is inspired by http://winmerge.svn.sourceforge.net/viewvc/winmerge/trunk/Plugins/src_VB/IgnoreTwoFirstCharsOrder, and does what its name IgnoreTwoFirstCharsOrder.wsc implies:

Code: Select all
<scriptlet>

<implements type='automation'>
   <method name='Reset'/>
   <method name='ProcessLine'/>
</implements>

<script language='vbs'>
Option Explicit

Sub Reset(side)
End Sub

Function ProcessLine(text)
   Dim c1, c2
   c1 = Mid(text, 1, 1)
   c2 = Mid(text, 2, 1)
   If c1 < c2 Then
      ProcessLine = c2 & c1 & Mid(text, 3)
   End If
End Function
</script>
</scriptlet>
Last edited by jtuc on Sun Jun 10, 2012 12:43 pm, edited 1 time in total.
jtuc
Developer
 
Posts: 182
Joined: Sat Dec 20, 2008 11:05 am

Re: WinMerge 2011 is now at Bitbucket

Postby wolfing1 » Wed Apr 04, 2012 1:58 pm

Can you add date filters when selecting the files/folders to compare? (for comparing folders) So it would only do the comparison for files modified after such date, or modified between date1 and date2 for example?
wolfing1
 
Posts: 1
Joined: Wed Apr 04, 2012 1:46 pm

Re: WinMerge 2011 is now at Bitbucket

Postby snovotill » Sat Nov 18, 2017 11:23 pm

GOOD GOD! This fixes ALL the annoying and time-sucking bugs I've been tripping over in WinMerge for the last several years! Excellent work jtuc, life is good again!
snovotill
 
Posts: 1
Joined: Sat Nov 18, 2017 11:19 pm

Previous

Return to Open Discussion

Who is online

Users browsing this forum: Google [Bot] and 1 guest