New 2.12.x stable release

Main development forum.

Re: New 2.12.x stable release

Postby jtuc » Sun Oct 24, 2010 12:25 pm

I dare add the following:
  • HexMerge feature - need to consider
  • Fix readonly logic for ClearCase integration (#3017741) - need to consider
jtuc
Developer
 
Posts: 182
Joined: Sat Dec 20, 2008 11:05 am

Re: New 2.12.x stable release

Postby kimmov » Sun Oct 24, 2010 12:43 pm

Agreed about HexMerge - if at all feasible we should merge it.
kimmov
 
Posts: 562
Joined: Thu Sep 11, 2008 8:51 pm
Location: Finland

Re: New 2.12.x stable release

Postby jtuc » Sun Oct 24, 2010 5:17 pm

kimmov wrote:Agreed about HexMerge - if at all feasible we should merge it.


Original feature dates back to before we branched for 2.12, and there have only been moderate changes, the most notable being that WinMerge works with Frhed as delivered by the respective project, rather than including its own version of it. I did the merge 1 month ago, but excluded the context menu item because there was no consensus about wording so far. I recall you disliked the term "HEX". I myself have come to disliking the term "Compare Special >", although I was the one who invented it when adding the builtin XML whitespace canonicalization feature. I think "Compare As >" is the common term for such thing. Any objections against "Compare As > Binary"?
jtuc
Developer
 
Posts: 182
Joined: Sat Dec 20, 2008 11:05 am

Re: New 2.12.x stable release

Postby kimmov » Sun Oct 24, 2010 5:24 pm

jtuc wrote:Any objections against "Compare As > Binary"?

Not from me, that sounds good. And situation being what it is I think it is most important we have just something sensible for now.
kimmov
 
Posts: 562
Joined: Thu Sep 11, 2008 8:51 pm
Location: Finland

Re: New 2.12.x stable release

Postby gerundt » Mon Oct 25, 2010 9:22 am

jtuc wrote:Any objections against "Compare As > Binary"?


No, I like it too! :mrgreen:
gerundt
Site Admin
 
Posts: 192
Joined: Wed Sep 24, 2008 8:47 am
Location: Germany

Re: New 2.12.x stable release

Postby kimmov » Thu Oct 28, 2010 7:01 pm

One important thing to add is to have installed Frhed work as hexeditor as it works in Trunk. At least for it me it seems in 2.14 branch we still use the hexeditor from ext-folder?

I've now updated SCEW and PCRE. Though it seemed to add new memory leak, even if you just start and close WinMerge? No idea (nor time at the moment) to check that. I've also updated project files to VS2005 format and updated various patches, small updates to installer etc.

I also noticed that Tim dropped ANSI support from some parts. Need to finish this work too, in scripts etc.
kimmov
 
Posts: 562
Joined: Thu Sep 11, 2008 8:51 pm
Location: Finland

Re: New 2.12.x stable release

Postby jtuc » Sat Oct 30, 2010 9:25 am

kimmov wrote:At least for it me it seems in 2.14 branch we still use the hexeditor from ext-folder?


2.14 branch uses registered dll from Frhed application. Externals/heksedit folder is obsolete.
jtuc
Developer
 
Posts: 182
Joined: Sat Dec 20, 2008 11:05 am

Re: New 2.12.x stable release

Postby kimmov » Sat Oct 30, 2010 9:34 am

jtuc wrote:
kimmov wrote:At least for it me it seems in 2.14 branch we still use the hexeditor from ext-folder?

2.14 branch uses registered dll from Frhed application. Externals/heksedit folder is obsolete.

Ok, good! Then I'll just remove the Externals/hexedit and fix docs etc. Sorry I missed the fact you already "fixed" it!
kimmov
 
Posts: 562
Joined: Thu Sep 11, 2008 8:51 pm
Location: Finland

Re: New 2.12.x stable release

Postby gerundt » Tue Jan 04, 2011 3:52 pm

I backport many code cleanups and some bugfixes to R2_14. The many things that remain are the CString/String conversation and some bigger patches. I do my best with my limited C/C++ knowledge but think now must a real C/C++ developer must take a look at the branch. :mrgreen:
gerundt
Site Admin
 
Posts: 192
Joined: Wed Sep 24, 2008 8:47 am
Location: Germany

Re: New 2.12.x stable release

Postby gerundt » Sun May 29, 2011 12:23 pm

How are the chances for a new stable release, if Takashi helps? He still works on his WinMerge JP version and did even some small changes at the R2_14 branch.

Maybe he can also port some changes from his JP version to the normal version:


What do you think?
gerundt
Site Admin
 
Posts: 192
Joined: Wed Sep 24, 2008 8:47 am
Location: Germany

PreviousNext

Return to Developers

Who is online

Users browsing this forum: Google [Bot] and 2 guests