Summary: | KDESvn mangles options passed to external conflict resolver | ||
---|---|---|---|
Product: | [Applications] kdesvn | Reporter: | Stefan Radermacher <kde> |
Component: | General | Assignee: | Rajko Albrecht <ral> |
Status: | RESOLVED INTENTIONAL | ||
Severity: | normal | CC: | Ch.Ehrlicher, jaanvajakas, kde, ral |
Priority: | NOR | ||
Version: | 1.6.0 | ||
Target Milestone: | --- | ||
Platform: | Compiled Sources | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: | ||
Attachments: | Patch to fix this problem |
Description
Stefan Radermacher
2013-07-10 07:57:29 UTC
Created attachment 81037 [details]
Patch to fix this problem
As reviewboard fucntionality is not yet up for KDESvn, I'm including this patch here.
https://git.reviewboard.kde.org/ has kdesvn repository now. Well, looks that subversion itself had swapped the parameters - I don't know if it comes with svn 1.7 or 1.6. And in earlier versions of svn resolve gots always relative pathnames, thats why the trick with base path. I'd worked around in commit 5a35ddcb ( http://commit.kde.org/kdesvn/5a35ddcb7ebb575435a4282a9b06fcf13030894f ) Would be nice, if you check what I did so I may close this ticket. For correct work a subversion 1.7 specific interface must integrated. *** Bug 344035 has been marked as a duplicate of this bug. *** The Qt4/KF4 version of kdesvn is no longer supported - closing. Please open again if this still happens with kdesvn 2.0. |