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
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