Bug 322182 - KDESvn mangles options passed to external conflict resolver
Summary: KDESvn mangles options passed to external conflict resolver
Status: RESOLVED INTENTIONAL
Alias: None
Product: kdesvn
Classification: Applications
Component: General (show other bugs)
Version: 1.6.0
Platform: Compiled Sources Linux
: NOR normal
Target Milestone: ---
Assignee: Rajko Albrecht
URL:
Keywords:
: 344035 (view as bug list)
Depends on:
Blocks:
 
Reported: 2013-07-10 07:57 UTC by Stefan Radermacher
Modified: 2017-06-18 07:31 UTC (History)
4 users (show)

See Also:
Latest Commit:
Version Fixed In:
Sentry Crash Report:


Attachments
Patch to fix this problem (1.23 KB, patch)
2013-07-10 07:58 UTC, Stefan Radermacher
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Stefan Radermacher 2013-07-10 07:57:29 UTC
When expanding the path tokens such as %m, %n, and %o, KDESvn adds the current directory to the already full path name making it impossible for the external program to access to files. In addition, the association of these tokens to the files is switched around, the "new" and "work" file tokens are swapped.

Reproducible: Always
Comment 1 Stefan Radermacher 2013-07-10 07:58:22 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.
Comment 2 Christoph Feck 2013-07-19 01:36:55 UTC
https://git.reviewboard.kde.org/ has kdesvn repository now.
Comment 3 Rajko Albrecht 2013-08-16 12:51:29 UTC
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.
Comment 4 Rajko Albrecht 2013-08-18 09:25:06 UTC
For correct work a subversion 1.7 specific interface must integrated.
Comment 5 Christian Ehrlicher 2015-12-13 16:46:10 UTC
*** Bug 344035 has been marked as a duplicate of this bug. ***
Comment 6 Christian Ehrlicher 2017-06-18 07:31:30 UTC
The Qt4/KF4 version of kdesvn is no longer supported - closing. Please open again if this still happens with kdesvn 2.0.