[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Unable to shelve changes when using custom diff-cmd

From: Csongor Pal <cpal_at_feralinteractive.com>
Date: Tue, 26 Jun 2018 11:19:48 +0100

Hi,

I ran into an issue with svn shelve on my setup. I use the following script as my diff-cmd to open diffs with FileMerge on macOS: svn-diffwrap.sh <https://gist.github.com/dtjm/523243/6975de552166beb08943fe8a44f8b5ddbb29a875#file-svn-diffwrap-sh>

When running an svn shelve command I get the diffs opened up in FileMerge and the command fails with: svn: E200009: No changes were shelved

When I remove the diff-cmd setting from the config file svn shelve works as expected, but is there a way to have both features work at the same time?

I'm using svn, version 1.10.0 (r1827917) on macOS 10.13.

Thanks,
Csongor
Received on 2018-06-26 12:24:51 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.