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

Posted by tolomea on Stack Overflow See other posts from Stack Overflow or by tolomea
Published on 2010-05-26T21:57:13Z Indexed on 2010/05/26 22:01 UTC
Read the original article Hit count: 566

Filed under:

cvs

|

meld

|

subversion

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

© Stack Overflow or respective owner

Related posts about cvs

Ensuring all git commits make it back to CVS when using git-cvs

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm using git-cvs, and my general workflow is something like this: ...write some code... $ git commit $ git cvsexportcommit -c -p -v <asdf> $ git cvs-import $CVSROOT $ git pull This generally works fine for pushing my commits back to the CVS server and keeping things in sync. However, I'm… >>> More
CVS: command-line diff on a remote CVS server between two HEAD revs

as seen on Stack Overflow - Search for 'Stack Overflow'
My CVS-fu is not very strong anymore (after years of SVN'ing and now Mercurial'ing). I'm trying to do a diff between two revisions of the HEAD branch (everything is in the HEAD anyway). I received an IDE already set up to use a :pserver:myname@cvsserver:port/cvs/project CVS. I'm on Windows XP. I… >>> More
Permission denied for cvs server via ssh

as seen on Stack Overflow - Search for 'Stack Overflow'
I cant create a new project by importing a java project via eclipse onto my cvs server via internet. I created a directory as root called /priv/cvs/. Then i called "cvs -d /priv/cvs/ init". I created a user named cvs and a groups called cvs. The repository is owned by cvs and in group cvs. Then… >>> More
CVSROOT problem because of username string

as seen on Server Fault - Search for 'Server Fault'
Hi, I have always been SVN user but currently I have to use CVS as the source repository. I am quite new to CVS and really got confused many a times (reason being I always tried to access CVS like SVN !) However now I am really stuck in one problem wherein I am not able to do any cvs operations… >>> More
How to resolve CVS error: cannot rename file CVS/Entries.Extra.Backup to CVS/Entries.Extra: Bad addr

as seen on Stack Overflow - Search for 'Stack Overflow'
I've checked out a module from CVS onto a newly installed Windows 7 machine. The virus scanner has not yet been installed. Later, when I try to do an update, I get the following error message: cannot rename file CVS/Entries.Extra.Backup to CVS/Entries.Extra: Bad address Has anyone seen and resolved… >>> More

Related posts about meld

"Meld requires pygtk 2.8.0 or higher."

as seen on Super User - Search for 'Super User'
I got this error after installing Meld on a new Karmic installation: ~$ meld No module named pygtk Meld requires pygtk 2.8.0 or higher. I installed the latest version of python-gtk with aptitude but I'm not sure what version is actually installed. My python version is 2.6. This is weird because… >>> More
After installing Meld on 32-bit Karmic on 64-bit machine: "Meld requires pygtk 2.8.0 or higher."

as seen on Super User - Search for 'Super User'
I got this error after installing Meld on a new Karmic installation: ~$ meld No module named pygtk Meld requires pygtk 2.8.0 or higher. I installed the latest version of python-gtk with aptitude but I'm not sure what version is actually installed. My python version is 2.6. This is weird because… >>> More
How to make meld prefer an SVN diff over a CVS diff

as seen on Stack Overflow - Search for 'Stack Overflow'
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… >>> More
git-difftool: full file tree compare using meld?

as seen on Stack Overflow - Search for 'Stack Overflow'
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. >>> More
Installing meld on OS X

as seen on Stack Overflow - Search for 'Stack Overflow'
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? >>> More