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

Re: Unable to shelve changes when using custom diff-cmd

From: Branko Čibej <brane_at_apache.org>
Date: Tue, 26 Jun 2018 12:37:07 +0200

On 26.06.2018 12:19, Csongor Pal wrote:
> 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?

It would be helpful if the wrapper script returned the exit code from
the diff program. Something like 'exit $?' at the end would do it.

-- Brane
Received on 2018-06-26 12:37:16 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.