[Pkg-kde-extras] Bug#776456: kdesvn: Opening of files in kdiff3 for conflict resolution fails because of duplicated paths
Vincas Dargis
vindrg at gmail.com
Wed Jan 28 07:36:51 UTC 2015
Package: kdesvn
Version: 1.5.5-4.1
Severity: normal
Dear Maintainer,
I have tree conflict in my repository, and to fix that I've:
* opened checkout directory using kdesvn
* right-clicked on conflicted file, selected "Resolve conflcit"
* KDiff3 opened, but with error message like this:
Opening of these files failed:
-
/home/vincas/code/cpp/branches/debuggui/GPTServerTemp/home/vincas/code/cpp/branches/debuggui/GPTServerTemp/server.cpp
..merge-left.r2511
-
/home/vincas/code/cpp/branches/debuggui/GPTServerTemp/home/vincas/code/cpp/branches/debuggui/GPTServerTemp/server.cpp
..merge-right.r2536
-
/home/vincas/code/cpp/branches/debuggui/GPTServerTemp/home/vincas/code/cpp/branches/debuggui/GPTServerTemp/server.cpp.working
"cat /proc/$(pgrep kdiff3)/cmdline" gives me this (formatted for better
readibility):
kdiff3
/home/vincas/code/cpp/branches/debuggui/GPTServerTemp//home/vincas/code/cpp/branches/debuggui/GPTServerTemp/server.cpp
..merge-left.r2511
/home/vincas/code/cpp/branches/debuggui/GPTServerTemp//home/vincas/code/cpp/branches/debuggui/GPTServerTemp/server.cpp
..merge-right.r2536
/home/vincas/code/cpp/branches/debuggui/GPTServerTemp//home/vincas/code/cpp/branches/debuggui/GPTServerTemp/server.cpp.working
-o/home/vincas/code/cpp/branches/debuggui/GPTServerTemp/server.cpp
>From this I assume that it's kdesvn bug, not kdiff3 - provided paths are
duplicated, "/home/vincas..." part mentioned twice per path.
Side note - I'm using subversion from backports:
apt-cache policy subversion
subversion:
Installed: 1.8.10-1~bpo70+1
Candidate: 1.8.10-1~bpo70+1
Version table:
*** 1.8.10-1~bpo70+1 0
100 http://ftp.litnet.lt/debian/ wheezy-backports/main amd64 Packages
100 /var/lib/dpkg/status
1.6.17dfsg-4+deb7u8 0
500 http://ftp.litnet.lt/debian/ wheezy/main amd64 Packages
500 http://security.debian.org/ wheezy/updates/main amd64 Packages
-- System Information:
Debian Release: 7.8
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages kdesvn depends on:
ii kde-runtime 4:4.8.4-2
ii kdesvn-kio-plugins 1.5.5-4.1
ii libapr1 1.4.6-3+deb7u1
ii libaprutil1 1.4.1-3
ii libc6 2.13-38+deb7u7
ii libgcc1 1:4.7.2-5
ii libkdecore5 4:4.8.4-4+deb7u1
ii libkdeui5 4:4.8.4-4+deb7u1
ii libkio5 4:4.8.4-4+deb7u1
ii libkparts4 4:4.8.4-4+deb7u1
ii libnepomuk4 4:4.8.4-4+deb7u1
ii libnepomukutils4 4:4.8.4-4+deb7u1
ii libqt4-dbus 4:4.8.2+dfsg-11
ii libqt4-network 4:4.8.2+dfsg-11
ii libqt4-sql 4:4.8.2+dfsg-11
ii libqt4-svg 4:4.8.2+dfsg-11
ii libqt4-xml 4:4.8.2+dfsg-11
ii libqtcore4 4:4.8.2+dfsg-11
ii libqtgui4 4:4.8.2+dfsg-11
ii libsoprano4 2.7.6+dfsg.1-2wheezy1
ii libstdc++6 4.7.2-5
ii libsvn1 1.8.10-1~bpo70+1
ii libsvnqt6 1.5.5-4.1
Versions of packages kdesvn recommends:
ii graphviz 2.26.3-14+deb7u2
ii kompare 4:4.8.4+dfsg-1
Versions of packages kdesvn suggests:
ii kdiff3 0.9.96-4
pn khelpcenter <none>
-- no debconf information
More information about the pkg-kde-extras
mailing list