After a lot of search i could see that meId is a good diff tool for comparision in linux
I would like to use the meId for displaying the svn diff
I am new to linux as well as SVN
I just downloaded the meId and placed it on my desktop i am not sure what to do next ?
i could see 'svn diff -r 2165:2182 --diff-cmd meld' is used to do the trick
but i am not sure how to do this
Can some one guide me to get the diff of svn displayed in meID
Any help for this is greatly appreciated ..
You need to create a wrapper script as described here: SVN documentation
In the Meld wiki you can find a wrapper script used to merge with Meld: Meld wiki
You can find the command line usage of Meld in the documentation.
Related
is it possible to put comments in a directory about a dir or file locally on my own machine, appearing in my terminal. I don't have any kind of GUI, so this would be helpful.
Maybe something like, when I do ls -l I will see:
file.txt #this is that file I made on tuesday
files #this is the directory I made with all those other files
If so, what is the tool to do it?
Is it available for Arch Linux?
Yes, there is a tool for that. It is called GIT or SVN.
I have modified a third party bundle and I want to know all changes I've done.
What linux command can give me that? I guess should use diff command, but how?
Assuming you've got the original source in src/ and your modified version in my_src/, you can use diff with the --recursive switch:
diff --recursive src my_src
Try one of the GUI replacements of diff like KDiff3.
UPDATE
You might want to try and take a look at mtree.
I am planning to show the differecnes on the samefile by using CVS.
Say i have one file a.txt,it contains two revisions.
2.0
3.0
i can find differecne using cvs diff -r 3.0 -r 2.0 a.txt,but i want to show the changes on 3.0 file only.
That means i want to display the latest file of a.txt and mention the changes happend to file ?
Is it possible? Can someone guide me to how to start on this?
cvs log -N -S -rHEAD a.txt should give you the log message. If you have't checked out the latest revision, you can use cvs rlog
I don't know a way to print the latest revision (as in "cvs cat" or similar) with CVS. You probably have to use cvs checkout or convert your repo to a modern version control system (which you should really consider anyway; CVS is really outdated).
How do I get a GUI-based merge tool to work with command line SVN in linux? I understand that there are many options like meld, svn Diff, etc. out there. All of them require a helper script to allow svn to invoke the external program during conflict resolution. I followed the instructions given here and the nice svn manual with meld.
But in all cases, when I get to the merge conflict and type 'l' to invoke the external tool, I get an error: The external merge tool exited with exit code 255
I'm fairly certain I'm missing some key thing here. ITs too much of a coincidence for so many different solutions to fail. Would appreciate any solution or pointers to the problem.
Thanks!
Also make sure that the path in your config is absolute. It should be the same path you see when you run a pwd command from that directory. No aliases or relative paths. So if your username is foo you would replace this line:
Add this below it:
merge-tool-cmd = ~/bin/svn-merge-meld
With
Add this below it:
merge-tool-cmd = /Users/foo/bin/svn-merge-meld
You may not have the correct permissions on the wrapper script. Try something like this:
sudo chmod +x /usr/local/bin/mergewrap.py
I've found several wrapper scripts for vimdiff or meld which seem to pass the wrong number of arguments. Unless I've misunderstood the rather terse documentation about the commandline parameters, they only take 2 or 3 filenames. This may also cause the script to fail with an error.
When you use Tortoise SVN to update from the repository to your local machine, you get the popup that shows what files were added/updated/etc. I'm looking to get hold of that text programmatically.
Do you know if it's dumped to a temporary file or a log file? Or is there another way to get hold of that text? I can't see anything in the settings that provides for it.
One idea might be to use the svn.exe console program, like this
svn.exe log -r head -v <svn-dir>
-r means the revision (head being the newest)
-v being verbose (which includes the file names)
<svn-dir> is a dir that contains a svn checkout ( this can be omitted if you run the command inside such a dir).
There are also an -xml switch that might be useful if you want to massage the data in some way
This requires that you have a svn.exe in you path. It seems to be possible to find the svn.exe exec. here