RE: svn commit: r1834612 - in /subversion/branches/1.10.x-issue4758/subversion: libsvn_client/shelve.c tests/cmdline/shelve_tests.py

> -----Original Message-----
> From: julianfoad_at_apache.org [mailto:julianfoad_at_apache.org]
> Sent: donderdag 28 juni 2018 15:50
> To: commits_at_subversion.apache.org
> Subject: svn commit: r1834612 - in /subversion/branches/1.10.x-
> issue4758/subversion: libsvn_client/shelve.c tests/cmdline/shelve_tests.py
>
> Author: julianfoad
> Date: Thu Jun 28 13:50:28 2018
> New Revision: 1834612
>
> URL: http://svn.apache.org/viewvc?rev=1834612&view=rev
> Log:
> On the '1.10.x-issue4758' branch: Fix SVN-4758 "Unable to shelve changes
> when using custom diff-cmd".
>
> * subversion/libsvn_client/shelve.c
> (shelf_write_patch): Ignore any config file while executing the diff, so
> as to use the internal diff code.

This resets quite a bit more configuration that might still be necessary. (WC-NG config is the first thing I would think of). I think you should duplicate the hash and explicitly remove a few keys.

        Bert
Received on 2018-06-28 20:22:10 CEST