ksvn - KDE-Tools for Subversion
Required tools: diff3, kdiff3, kompare
ksvn just gets called like the standard svn tool:
ksvn <command> (see svn help)
ksvn normally just calls svn with the supplied arguments.
The following subcommands are treated specially though:
- up | update | merge
we add the --diff3-cmd parameter pointing to ourselves.
This will call kdiff3 for every merge with a conflict that can't be
handled by diff3.
- diff
we just call svn diff and pipe the output to kompare.
- adiff
alt diff: same as diff but with additional parameters for diff, which
makes reviewing a patch a bit simpler (-dbu5).
Copyright (c) 2001-2005 Robert Griebl, Coming GmbH, licensed under the GPL.
|