meld

What are the alternatives for meld (graphical diff tool) on OSX

I mostly develop on Linux and meld is indispensable for me. However, when I'm on the road I use a MacBook (leopard) and I want to use the same set of tools as on my main development box, meld being one of them. Although you shoud be able to install meld, I could not succeed with it. So... are there any alternatives that are as good (or ...

Use a different diff command with CVS?

Is it possible to use a different diff program with CVS? I'd like to use something like meld to give me a side-by-side graphical view of the repository and my changes. It's out of my control to use a different CMS. What would be ideal is some undocumented command line argument that would work like this: cvs diff -prog /usr/bin/meld f...

Unable to install Meld by MacPorts

I found that other people too have had trouble in installing Meld to Mac by MacPorts. I run sudo port install meld I get sudo port install meld ---> Activating shared-mime-info @0.60_0 Error: Target org.macports.activate returned: Image error: /opt/local/bin/update-mime-database already exists and does not belong to a registered...

Subversion diff for zipped xml file

I'm using MySQL Workbench to maintain the database schema for an application. The .mwb file that Workbench uses, which is a zipped XML document, is kept in a Subversion repository. The file is treated as binary data by Subversion, so I cannot use svn diff to show the changes, for example before committing. Since the data is really XML,...

View differences of branches with meld?

...

How to merge using Meld on Linux

Hi, I want to resolve some conflicts of an SVN file using Meld. I'm using the Head version and my version to resolve the conflicts. I am unable to find how to do the merge operation and resolve the conflicts. When i'm right clicking on the line, i just see copy, paste, cut, create patch copy to right, copy to left options. Is there any...

git-difftool: full file tree compare using meld?

Is there an easy way to compare the file tree of an old git commit with the working file tree, in meld? git-difftool does something very similar, but I don't want it to actually do any diffing; the whole point is that the tool it is calling can provide a better interface for that. ...

Installing meld on OS X

After I got MacPorts installed and did a 'sudo port -v selfupdate', I try to install meld. The installation just starts to Fetching all kinds of stuff gnome-comoon perl5.8 perl5 pkgconfig ..... this goes on and on. Is that normal? ...

How to make meld prefer an SVN diff over a CVS diff

We have some directories that are tracked in both CVS and SVN (loooong story). When I change a file in one of these and run meld it diffs it against the SVN version. However for some of the other developers it diffs against CVS. Is there a way to specify which one gets priority? Everyone is using Meld 1.3.0 edit: Ok, I see now that ther...

Combining 2 patch files that patch a number of files in a directory + resolving conflicts

Hello, I have a dir with thousands of files and 2 patch files that apply to the same dir. Each patch file patches 20-30 files in dir or it's subdirs. If I apply either patch to the common ancestor dir, it succeeds. But if I apply one patch file followed by the other, it fails because the line numbering has changed after one patch fil...