Public bug reported:
Binary package hint: kdiff3
This is my kdiff3 wrapper script
#!/bin/bash
KDIFF3_PATH=/usr/bin/
KDIFF3_EXEC=${KDIFF3_PATH}/kdiff3
# svn will invoke this with a bunch of arguments. These are:
# $1 - path to the file that is the original
# $2 - path to the file that's the incoming merge version
# $3 - path to the file that's the latest from trunk (current working copy)
# $4 - path to where svn expects the merged output to be written
${KDIFF3_EXEC} -m --L1 "Remote" --L2 "Base" --L3 "Mine" -o "$4" "$2" "$1" "$3"
If I use this with subversion, in its merge-tool-cmd, it doesnt work: on
"launching" it during a conflict, I get a message
"Process '/home/user/.subversion/kdiff3.sh' failed (exitwhy 6)"
I removed kdiff3-qt and installed kdiff3 and it worked.
What was most surprising that the wrapper script worked on its _own_
with NO problems (I mean, if I launched "sh wrapper.sh file1 file2 file3
file4" ), but it had problems when being launched from svn.
ProblemType: Bug
DistroRelease: Ubuntu 10.04
Package: kdiff3-qt (not installed)
ProcVersionSignature: Ubuntu 2.6.32-20.30-generic 2.6.32.11+drm33.2
Uname: Linux 2.6.32-20-generic x86_64
NonfreeKernelModules: wl
Architecture: amd64
Date: Thu Apr 15 18:09:35 2010
InstallationMedia: Kubuntu 10.04 "Lucid Lynx" - Beta amd64 (20100406.1)
ProcEnviron:
LANGUAGE=
PATH=(custom, username)
LANG=en_IN
SHELL=/bin/zsh
SourcePackage: kdiff3
** Affects: kdiff3 (Ubuntu)
Importance: Undecided
Status: New
** Tags: amd64 apport-bug lucid
--
kdiff3-qt on KDE 4.4.2 does not integrate with subversion via its merge-tool-cmd
https://bugs.launchpad.net/bugs/563794
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
