winmerge-user — For end users

[Winmerge-user] (no subject)

[Reshma B. <ema...@gm...>]

Hi,

I have a scenario. Can someone please help me on this?


*Scenario:*

·         There are several branches of the svn repo.

·         When the branch is about to be merged to the trunk, I want to run
an analysis ( code quality analysis using sonar).

·         The merge must be allowed iff it has no violations or the
threshold has not been crossed.

My question is,


On clicking merge, which script is invoked? Can I change it? If so, how?
Or, Can a new .exe or .bat can be invoked?


*Detailed Explanation:*

·         There is a trunk in the central server, with a common codebase.

·         It has different branches on which different teams are working,
based on different requirements.

·         When coding on that particular branch is completed, they try to
merge it back to trunk from client side (Tortoise SVN).

·         When the attempt to merge is done, sonar analysis must be done
(running some .bat scripts).

·         If there are any new critical & blocker violations are present,
or if the violation thresholds is crossed, the merge should not be allowed.
It must be aborted.

·         This is like introducing a forced check-in policy. The code in
the server must not be updated, unless the violations have been resolved.



Usage of CI tool like Jenkins has its advantages. However, Jenkins fetches
the code from the central server. But, my requirement is:



*"To decide whether the code must be allowed to be merged (checked-in) to
server or not, based on the sonar analysis."*


Looking forward for your response.

Thanks &  Regards,
Reshma

[Winmerge-user] regular expression filter for winmerge

[Ömer S. K. <ome...@ho...>]

Hello All,
I have implemented two filters for WinMerge at the following address.

https://sourceforge.net/projects/regexfilterforw/files/

I feel that there are other people looking for a similar functionality.

Feel free to experiment and send feedback.

See the release notes first.

sinan.
 		 	   		  
_________________________________________________________________
Hotmail: Powerful Free email with security by Microsoft.
https://signup.live.com/signup.aspx?id=60969

[Winmerge-user] feature request

[Tehn Y. C. <teh...@gm...>]

Hi,

While I used winmerge quite a lot, there is one feature that I would
love to have it in.

I want to be able to set it to ignore keyswords from subversion. In
some cases, the only difference between files are the subversion
keywords. It would be nice if I can configure Winmerge to ignore the
subversion keywords, perhaps selectively.

Cheers,
--
Tehn Yit Chin

[Winmerge-user] failed to compile winmerge(Unicode Release) with static mfc and crt library

[张. <kim...@qq...>]

hi, all!

i compiled it in VS2005, it shows below:
fatal error C1189: #error :  Please use the /MD switch for _AFXDLL builds

how to deal with it! i don't want to depend on MFC80U.dll and MSVCR80.dll

thanks very much!
------------------
best wishes to you
 kimi zhang

[Winmerge-user] show files as "identical" when a line filter excludes a line

[Brendan C. <bc...@ya...>]

When comparing folders, I want files to show up as identical when the only difference is an svn keyword comment (e.g.  * $Id: filename.h 27703 2007-12-14 23:42:51Z username $).

I've got a line filter that correctly matches that line, however, when comparing a folder with dozens of such files, I'd like winmerge to consider these files as identical.

It looks as though line filters may not be able to do this and that I need a plug-in -- if this is the case, is anyone aware of a plug-in that filters timestamps/svn keywords from a file?

thank you,
bcreane

[Winmerge-user] deficiency of CompareMSExcelFiles

[TK S. <tee...@gm...>]

[same msg posted to open-discussion ML]

I have just started using WinMerge to compare MS-Excel files. Here's
my observation so far.

First, the output of CompareMSExcelFiles (used eventually for
comparison) are not structured very well, making it hard to locate the
sheets/modules/... on the differences.

Second, CompareMSExcelFiles becomes painfully slow when comparing
large files. In fact, I was never able to compare some files that
contains 100+ worksheet and modules (file size > 20MB), as I had to
kill WinMerge that appeared to have locked up on several tries.

A quick peek into the VB source suggested that it might be caused by
the fact that CompareMSExcelFiles actually try to capture all the data
in memory and only write them to the file for comparison at the end of
the capture cycle. On top of that, writing/reading the temp files
line-by-line may be yet another major factor.

Unfortunately I don't currently have the capability to develop on VB.
So I wonder if the maintainer of this plugin can help optimize it for
large Excel files. Thanks.

Re: [Winmerge-user] Regular Expression Problem

[Kimmo V. <ki...@ko...>]

Hi, and sorry for late reply.

> I'm trying to compare two files, containing share price quotes, using 
> only the first part of each line (ie, the exchange Code). I'm not 
> interested in the differences in quotes, but am trying to determine 
> which Codes appear in one file but not in the second file. I realise 
> that I need to use Regular Expression(s) but I'm not having any luck 
> and would appreciate some help.

Regexp in WinMerge filter is only for ignoring single lines in diff-
engine, you cannot modify data. If regexp you define matches line, that 
line is ignored and not compared to another file.

If you want to modify data before compare, then 2.0 has no means for 
it. Latest 2.1.x builds have implemented plugins-interface, which 
allows modifying text buffers before they are sent to diff-engine.


Regards,
Kimmo

-- 
Kimmo Varis - ki...@ko...

[Winmerge-user] Regular Expression Problem

[John T. <ma...@dc...>]

Hi to all,

I'm trying to compare two files, containing share price quotes, using =
only the first part of each line (ie, the exchange Code).  I'm not =
interested in the differences in quotes, but am trying to determine =
which Codes appear in one file but not in the second file.  I realise =
that I need to use Regular Expression(s) but I'm not having any luck and =
would appreciate some help.

The original data lists look like this:

BAR,20031126,0.062,0.065    =
BANIYD,20031126,212.73,212.73BAROA,20031126,0.00,0.00    =
BAR,20031126,0.062,0.065BGDOA,20031126,0.033,0.033  =
BGD,20031126,0.185,0.185BGF,20031126,0.115,0.115    =
BGDOA,20031126,0.033,0.033BGN,20031126,0.275,0.28     =
BGF,20031126,0.115,0.115BHL,20031126,0.00,0.00      =
BGN,20031126,0.275,0.28BHP,20031126,11.10,11.11    =
BHFHA,20031126,112.704,112.704BHPDMF,20031126,0.00,0.00   =
BHL,20031126,4.85,4.85                            =
BHP,20031126,11.1,11.11                            =
BHPDMF,20031126,5.25,5.25I would like the result, after applying a =
Regular Expression to the compare, to look like this:

                            BANIYD,20031126,212.73,212.73
BAR,20031126,0.062,0.065    BAR,20031126,0.062,0.065
BAROA,20031126,0.00,0.00    BAROA,20031126,0.02,0.02
BGDOA,20031126,0.033,0.033  BGDOA,20031126,0.033,0.033
BGF,20031126,0.115,0.115    BGF,20031126,0.115,0.115
BGN,20031126,0.275,0.28     BGN,20031126,0.275,0.28
                            BHFHA,20031126,112.704,112.704
BHL,20031126,0.00,0.00      BHL,20031126,4.85,4.85
BHP,20031126,11.10,11.11    BHP,20031126,11.1,11.11
BHPDMF,20031126,0.00,0.00   BHPDMF,20031126,5.25,5.25

TIA

Cheers,

John

Re: [Winmerge-user] Plug-ins

[Christian L. <lis...@ho...>]

----- Original Message ----- 
From: "Donal O'Brien"
To: <win...@li...>
> Hi,
>   I'm interested in writing a plug-in for WinMerge. Is there any
> documentation available for writing and testing plug-ins?
>
> Thanks,
> DONAL

There is a few textfiles in the plugins directory which describes the
interface to use.
Laoran is the main developer on the plugins, he should be able to answer any
questions you might have.

Regards
Christian

[Winmerge-user] Plug-ins

[Donal O. <don...@ir...>]

Hi, <BR>I'm interested in writing a plug-in for WinMerge. Is there any documentation available for writing and testing plug-ins? <BR><BR>Thanks, <BR>DONAL <BR>

[Winmerge-user] Plug-ins

[Donal O'B. <don...@ir...>]

Hi,
  I'm interested in writing a plug-in for WinMerge. Is there any
documentation available for writing and testing plug-ins?

Thanks,
DONAL

Re: [Winmerge-user] diff algorithm?

[Kimmo V. <ki...@ko...>]

Hi,

WinMerge uses a modified GNU/diffutils as diff-engine. I cannot say 
much about algorithm itself, but going to www.gnu.org documentation 
and using google you find more information.

Diffutils documentation:
http://www.gnu.org/manual/diffutils-2.8.1/diff.html

WinMerge does not use that patch-file diffutils normally produces but 
a list diffutils's internal "diffranges" containing linenumbers of 
changed lines. Based on those linenumbers WinMerge marks changes 
between files on screen.

Using diffutils is reason WinMerge cannot compare binary files or 
show exact differences on lines. Latter may sound simple comparing 
char by char but that wouldn't handle removed/added words etc 
properly.


Regards,
Kimmo

[Winmerge-user] diff algorithm?

[Ethan C. <ye...@li...>]

Hi,
    I'm new to all this diff stuff, but I was wondering what algorithm =
you use to diff two files?  Is it a line by line comparison or something =
more advanced?  This seems to be a very difficult problem!

-E

[Winmerge-user] Using WinMerge from an Explorer shell

[Christian L. <lis...@ho...>]

I have found the project CBShellExt at 
http://sourceforge.net/projects/cbshellext/
They are actually extending WinMerge to be used from an Explorer shell in 
combination with other usefull tools for software development.

Regards
Christian List

_________________________________________________________________
Add photos to your e-mail with MSN 8. Get 2 months FREE*.  
http://join.msn.com/?page=features/featuredemail

Re: [Winmerge-user] Merging in diff files using WinMerge?

[Kimmo V. <ki...@ko...>]

> > Sounds like you're talking about trying to take the text output of a
> > UNIX-like "diff" utility, and then wanting to merge one set of
> > differences into another version of the same file?   Not sure WinMerge
> > does this.   Cool idea though.  :-)
> 
> Yes, this is what I'm trying to do. We get a lot of patches submitted,
> and since I'm using WinMerge anyway, it would make sense to use it if
> it's capable of it.
> 
> Seeing as the program is called Win*Merge* and the home page says "Merge
> differences" as one of the features, I wondered if there was something I
> didn't understand in the UI. But maybe it's not implemented.

It's not implemented.  There is RFE "695741 Generate and apply 
patches".

> > Actually, I'm not sure WinMerge even lets you save the
> > output of the WinMerge "diff" to text output.
> 
> That would be my next question. ;)

..same RFE :)

WinMerge saves diff.txt to $temp path.  That's diff output from files 
you are merging.

Regards,
Kimmo
-- 
Kimmo Varis - ki...@ko...

Re: [Winmerge-user] Merging in diff files using WinMerge?

[Alexander L. <li...@pl...>]

On Tue, 6 May 2003 13:59:50 -0500, Jeff Brown <jb...@ba...> wrote:

> Sounds like you're talking about trying to take the text output of a
> UNIX-like "diff" utility, and then wanting to merge one set of 
> differences
> into another version of the same file?   Not sure WinMerge does this.   
> Cool
> idea though.  :-)

Yes, this is what I'm trying to do. We get a lot of patches submitted, and 
since I'm using WinMerge anyway, it would make sense to use it if it's 
capable of it.

Seeing as the program is called Win*Merge* and the home page says "Merge 
differences" as one of the features, I wondered if there was something I 
didn't understand in the UI. But maybe it's not implemented.

> Actually, I'm not sure WinMerge even lets you save the
> output of the WinMerge "diff" to text output.

That would be my next question. ;)

-- 
Alexander Limi   ¤   Co-Founder·Plone
http://limi.net   ¤   http://plone.org
Interface Design   ¤   Usability Analysis
 
高联合 · アレクサンダー リミ · 이미짱

[Winmerge-user] Merging in diff files using WinMerge?

[Alexander L. <li...@pl...>]

Hi,

Firstly, I absolutely love WinMerge, and most of our developers on the 
Plone project use it for all their diffing needs. Thanks for a great tool. 
:)

My question: how can I merge a diff file into an existing file with 
WinMerge? I had a look in the docs, tried Google, and newsgroups - and 
found no explanation on how to do it. Is it so obvious that I missed it?

BTW, saw you were struggling with WinCVS - I highly recommend the excellent 
TortoiseCVS over WinCVS - and the intergration with WinMerge makes a 
powerful combination.

-- 
Alexander Limi   ¤   Co-Founder·Plone
http://limi.net   ¤   http://plone.org
Interface Design   ¤   Usability Analysis
 
高联合 · アレクサンダー リミ · 이미짱

[Winmerge-user] symbols

[<Vin...@al...>]

Hello,

Since i have some problem using winmerge afetr a computer reboot, i would
like to dowload symbols. But i don't know where i can find them.
Can anyone help me?


Vincent

[Winmerge-user] Comparing Directories in SourceOffSite

[Laurence M. <lm...@pt...>]

Hi,

I'm using winmerge to as my diff tool when using
SourceOffSite and for single files it works great, but for
directories (SOS projects) it doesn't do what I expect. Can
anyone give me advice on how to configure WinMerge in SOS?
Also, how can I get WinMerge to start with the default
"recursive" checked when comparing directories?

Laurence

[Winmerge-user] Feature request

[Philippe F. <P....@OB...>]

	Hi,

WinMerge is good stuff. I am fund of good merge clients. I have written one
for Unix (http://klotski.berlios.de/kmerge/) because unix still lacks good
merge clients.


Anyway, threre are just a few things I wish WinMerge had:

- Search and Replace in "Edit File". If I diff some files from two projects
where some names differ, I want to replace "Toto" by "Tutu" everywhere, to
focus on the relevant stuff.

- Merge both differencies: Take the difference from the left file, then from
the right file, and popup a dialog to edit the result. This is pretty useful
when neither the code on the left, nor the code on the right works.

- Edit individual differences: sometimes useful, but could be replaced by
the previous option.

- Color code: display the normal differences, the edited differences and the
merge differences with a different color.


	regards,

	PHilippe

[Winmerge-user] Maximum file sizes

[<jp...@cs...>]

Is there a maximum file size for input files?  When comparing two text
files of size 472KB and 496KB WinMerge always reports that they are
identical (they are not).  Is this a bug or a known limitation?

[Winmerge-user] WinMerge Version numbers

[Lim Dennis-C. <Den...@mo...>]

Bruce,

we use a utility called stampver which can be found at http://www.elphin.com/products/stampver.html

check it out.

regards,

Dennis

[Winmerge-user] building from CVS

[Bruce S. <br...@pi...>]

Hi,

I've been successful in downloading WimMerge through CVS and been able =
to build the program. But the version number is 999.999.999.999.  I know =
its only a trivial thing, but I curious as to how the version number =
gets set in the official release builds???

Regards
Bruce

Re: [Winmerge-user] Building from CVS

[Neil H. <nho...@bi...>]

   Hi Dean,

> I wonder if you are using the
> DSP project file, because DiffView.cpp isn't even included in the build
any
> more (I just deleted it from CVS)?

   I used WinMerge/Merge.dsp as I haven't found anything else that looks
like a project or make file.

> Also, make sure you're getting the
> "common" repository as well.

   Yes, I'm OK on that one.

> Also note that the current code in CVS incorporates syntax highlighting
> edit views (CCrystalEditView) already.

   Cool. Looks like I don't have to put in any work myself then. :-)

   Neil

RE: [Winmerge-user] Building from CVS

[Dean G. <de...@co...>]

Neil,
  Also note that the current code in CVS incorporates syntax highlighting
edit views (CCrystalEditView) already.

Dean

> -----Original Message-----
> From: win...@li...
> [mailto:win...@li...]On Behalf Of Neil
> Hodgson
> Sent: Tuesday, March 27, 2001 7:37 PM
> To: Win...@li...
> Subject: [Winmerge-user] Building from CVS
>
>
>    Hi,
>
>    I was looking at changing the text views in WinMerge to use my
> Scintilla
> edit control (www.scintilla.org) so that there would be syntax styling for
> the text.
>
>    It appears that the current set of files in CVS does not build
> - there is
> some confusion between CDiffView and CMergeEditView and some protected and
> private members are being used where that use is disallowed. Are
> there plans
> to update the CVS with a consistent set of files?
>
>    Neil
>
>
>
> _______________________________________________
> Winmerge-user mailing list
> Win...@li...
> http://lists.sourceforge.net/lists/listinfo/winmerge-user
>