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

2018-06-28 Thread Julian Foad
> Csongor Pal writes: >> When running an svn shelve command I get the diffs opened up in >> FileMerge and the command fails with: svn: E29: No changes were >> shelved > [...] >> I'm using svn, version 1.10.0 (r1827917) on macOS 10.13. Philip Martin wrote: > [...] The long term fix for 1.10

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

2018-06-27 Thread Philip Martin
Csongor Pal writes: > 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 > > > When running an svn

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

2018-06-27 Thread Daniel Shahaf
Branko Čibej wrote on Tue, 26 Jun 2018 12:37 +0200: > 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. Come again? Appending 'exit $?' to a shell script is a no-op; a script returns the exit code of its last

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

2018-06-26 Thread Branko Čibej
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 >

Unable to shelve changes when using custom diff-cmd

2018-06-26 Thread Csongor Pal
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 When running an svn shelve command I get the