54 lines
2.2 KiB
Diff
54 lines
2.2 KiB
Diff
|
------------------------------------------------------------------------
|
||
|
|
r1829015 | astieger | 2018-04-13 00:18:29 +0200 (Fri, 13 Apr 2018) | 6 lines
|
||
|
|
Changed paths:
|
||
|
|
M /subversion/trunk/subversion/svn/help-cmd.c
|
||
|
|
M /subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
|
||
|
|
|
||
|
|
Follow-up to r1829012, handle macro correctly
|
||
|
|
|
||
|
|
* subversion/svn/help-cmd.c (svn_cl__help): handle macro correctly
|
||
|
|
* tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
|
||
|
|
(svn_min__help): same
|
||
|
|
|
||
|
|
------------------------------------------------------------------------
|
||
|
|
r1829012 | astieger | 2018-04-13 00:03:06 +0200 (Fri, 13 Apr 2018) | 8 lines
|
||
|
|
Changed paths:
|
||
|
|
M /subversion/trunk/subversion/svn/help-cmd.c
|
||
|
|
M /subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
|
||
|
|
|
||
|
|
Follow-up to r1798004, fix informative output for Gnome Keyring with
|
||
|
|
libsecret
|
||
|
|
|
||
|
|
* subversion/svn/help-cmd.c (svn_cl__help): Print Gnome Keyring when
|
||
|
|
* using libsecret
|
||
|
|
* tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
|
||
|
|
(svn_min__help): same
|
||
|
|
|
||
|
|
------------------------------------------------------------------------
|
||
|
|
Index: trunk/subversion/svn/help-cmd.c
|
||
|
|
===================================================================
|
||
|
|
--- trunk/subversion/svn/help-cmd.c (revision 1829011)
|
||
|
|
+++ trunk/subversion/svn/help-cmd.c (revision 1829015)
|
||
|
|
@@ -166,7 +166,7 @@
|
||
|
|
pool);
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
-#ifdef SVN_HAVE_GNOME_KEYRING
|
||
|
|
+#if (defined(SVN_HAVE_GNOME_KEYRING) || defined(SVN_HAVE_LIBSECRET))
|
||
|
|
svn_stringbuf_appendcstr(version_footer, "* Gnome Keyring\n");
|
||
|
|
#endif
|
||
|
|
#ifdef SVN_HAVE_GPG_AGENT
|
||
|
|
Index: trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
|
||
|
|
===================================================================
|
||
|
|
--- trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c (revision 1829011)
|
||
|
|
+++ trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c (revision 1829015)
|
||
|
|
@@ -163,7 +163,7 @@
|
||
|
|
pool)),
|
||
|
|
pool);
|
||
|
|
#endif
|
||
|
|
-#ifdef SVN_HAVE_GNOME_KEYRING
|
||
|
|
+#if (defined(SVN_HAVE_GNOME_KEYRING) || defined(SVN_HAVE_LIBSECRET))
|
||
|
|
svn_stringbuf_appendcstr(version_footer, "* Gnome Keyring\n");
|
||
|
|
#endif
|
||
|
|
#ifdef SVN_HAVE_GPG_AGENT
|