07-22-2008
solved (kinda)
there were two things that i learned that made this problem much easier to deal with.
1) the settings for svn are in ~/.subversion/config
within that files is a line that says
diff-cmd = gvim -d
i just changed that to
diff-cmd = diff
and my life got way better.
2) i learned about kompare. which is a pretty sweet tool for comparing files. you can use it like so
svn diff (filename) | kompare -
(notice the '-' at the end, it's important)
which is pretty sweet to display changes, but it's not immediately obvious as to how to make any edits or how to merge changes or anything.
for now i have a working solution. however my ideal situation would have been to get a gvim window with a vertical split with a file on each side (which is how "gvim -d filename1 filename2" looks).
i tried using the full path name to gvim in the config file to no avail. i'm currently happy with my small battle, but would love to be able to use gvim for svn diff.
10 More Discussions You Might Find Interesting
1. Shell Programming and Scripting
Hello,
I want to compare two files. All records in file 2 that are not in file 1 should be output to file 3.
For example:
file 1
123
1234
123456
file 2
123
2345
23456
file 3 should have
2345
23456
I have looked at diff, bdiff, cmp, comm, diff3 without any luck! (2 Replies)
Discussion started by: blt123
2 Replies
2. Shell Programming and Scripting
Hi,
svn diff does not work very well with 2 local folders, so I am trying to do this diff using diff locally.
since there's a bunch of meta files in an svn directory, I want to do a diff that excludes everything EXCEPT *.java files. there seems to be only an --exclude option, so I'm not sure... (3 Replies)
Discussion started by: ackbarr
3 Replies
3. Solaris
Hi Friends
I have a compiler(Sun Forte,I believe) running in my Solaris 9 box.
since y'day my development team is finding this error when they compile:
ld.so.1: expr: fatal: libgmp.so.3: open failed: No such file or directory
I ran a search for this file and found it in one of my file... (2 Replies)
Discussion started by: Hari_Ganesh
2 Replies
4. Shell Programming and Scripting
Hi Everyone,
I am writing a shell script for the below needs and would like your suggestions and advices.
I have a lot of scripting files(Shell Scripts) under the directory:
/home/risk_dev/dev
I have another directory which has a lot of shell scripts under the directory:
... (2 Replies)
Discussion started by: filter
2 Replies
5. Solaris
Hi,
I am new to SVN configuration on Solaris 10.I have installed SVN client version 1.7.
bash-3.00# ./svn --version
svn, version 1.7.4 (r1295709)
compiled Mar 2 2012, 12:59:36
Here my requirement is how to integrate svn client to One of the SVN server repository.
My repository... (0 Replies)
Discussion started by: muraliinfy04
0 Replies
6. Solaris
Hi Guys,
I am facing this Error
bash-2.03$ ./curl -V
ld.so.1: curl: fatal: libldap.so.5: open failed: No such file or directory
Killed
bash-2.03$
while executing
./curl -V in /opt/sfw/bin directory.
I am using Sun Solaris 10.
which package upgrage can give me this missing... (9 Replies)
Discussion started by: manalisharmabe
9 Replies
7. Shell Programming and Scripting
Hi Folks,
I have a directory at /usr/local/aa and there is other directory where I have checkout the code through svn checkout command ( /opt/app/fgh) now I can apply svn log command here as shown below
$ cd /opt/app/fgh
svn checkout <url>
svn log
shows me the log on console .
please... (3 Replies)
Discussion started by: punpun66
3 Replies
8. Shell Programming and Scripting
Hi Folks ,
I am asking this question but i apologise please if this is not the correct forum ,
I have to develop a shell script that i want to place in at hooks/post-commit , that is basically i have to develop a post hook script and the main functionality of that script would be lets say if... (0 Replies)
Discussion started by: sunsun06060606
0 Replies
9. UNIX for Advanced & Expert Users
I'm quite new to SVN and having configured it based on tutorials from youtube etc, I have it setup like below:
* User1 and User2 can commit and update using their own passwords,
* Updates from both user1 and user2 are visible to each other
* files are shared between both user1 and user2
*... (2 Replies)
Discussion started by: busyboy
2 Replies
10. Shell Programming and Scripting
Hi, The below commands works fine on serverB
. /etc/profile;
cd /export/home/user2/utils/plugin/
./runme.shHowever, when i run the same commands from serverA it fails
$ ssh -q user2@serverB ". /etc/profile; cd /export/home/user2/utils/plugin; ./runme.sh"Output Error:
Please find the below... (8 Replies)
Discussion started by: mohtashims
8 Replies
LEARN ABOUT LINUX
git-difftool
GIT-DIFFTOOL(1) Git Manual GIT-DIFFTOOL(1)
NAME
git-difftool - Show changes using common diff tools
SYNOPSIS
git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]
DESCRIPTION
git difftool is a Git command that allows you to compare and edit files between revisions using common diff tools. git difftool is a
frontend to git diff and accepts the same options and arguments. See git-diff(1).
OPTIONS
-d, --dir-diff
Copy the modified files to a temporary location and perform a directory diff on them. This mode never prompts before launching the diff
tool.
-y, --no-prompt
Do not prompt before launching a diff tool.
--prompt
Prompt before each invocation of the diff tool. This is the default behaviour; the option is provided to override any configuration
settings.
-t <tool>, --tool=<tool>
Use the diff tool specified by <tool>. Valid values include emerge, kompare, meld, and vimdiff. Run git difftool --tool-help for the
list of valid <tool> settings.
If a diff tool is not specified, git difftool will use the configuration variable diff.tool. If the configuration variable diff.tool is
not set, git difftool will pick a suitable default.
You can explicitly provide a full path to the tool by setting the configuration variable difftool.<tool>.path. For example, you can
configure the absolute path to kdiff3 by setting difftool.kdiff3.path. Otherwise, git difftool assumes the tool is available in PATH.
Instead of running one of the known diff tools, git difftool can be customized to run an alternative program by specifying the command
line to invoke in a configuration variable difftool.<tool>.cmd.
When git difftool is invoked with this tool (either through the -t or --tool option or the diff.tool configuration variable) the
configured command line will be invoked with the following variables available: $LOCAL is set to the name of the temporary file
containing the contents of the diff pre-image and $REMOTE is set to the name of the temporary file containing the contents of the diff
post-image. $MERGED is the name of the file which is being compared. $BASE is provided for compatibility with custom merge tool
commands and has the same value as $MERGED.
--tool-help
Print a list of diff tools that may be used with --tool.
--[no-]symlinks
git difftool's default behavior is create symlinks to the working tree when run in --dir-diff mode and the right-hand side of the
comparison yields the same content as the file in the working tree.
Specifying --no-symlinks instructs git difftool to create copies instead. --no-symlinks is the default on Windows.
-x <command>, --extcmd=<command>
Specify a custom command for viewing diffs. git-difftool ignores the configured defaults and runs $command $LOCAL $REMOTE when this
option is specified. Additionally, $BASE is set in the environment.
-g, --gui
When git-difftool is invoked with the -g or --gui option the default diff tool will be read from the configured diff.guitool variable
instead of diff.tool.
See git-diff(1) for the full list of supported options.
CONFIG VARIABLES
git difftool falls back to git mergetool config variables when the difftool equivalents have not been defined.
diff.tool
The default diff tool to use.
diff.guitool
The default diff tool to use when --gui is specified.
difftool.<tool>.path
Override the path for the given tool. This is useful in case your tool is not in the PATH.
difftool.<tool>.cmd
Specify the command to invoke the specified diff tool.
See the --tool=<tool> option above for more details.
difftool.prompt
Prompt before each invocation of the diff tool.
SEE ALSO
git-diff(1)
Show changes between commits, commit and working tree, etc
git-mergetool(1)
Run merge conflict resolution tools to resolve merge conflicts
git-config(1)
Get and set repository or global options
GIT
Part of the git(1) suite
Git 1.8.5.3 01/14/2014 GIT-DIFFTOOL(1)