subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1657528 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Date Thu, 05 Feb 2015 10:59:47 GMT
Author: philip
Date: Thu Feb  5 10:59:46 2015
New Revision: 1657528

URL: http://svn.apache.org/r1657528
Log:
* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Followup to r1645578, correct conditional.

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1657528&r1=1657527&r2=1657528&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Feb  5 10:59:46 2015
@@ -792,7 +792,7 @@ handle_text_conflict(svn_wc_conflict_res
       else if (strcmp(opt->code, "df") == 0)
         {
           /* Re-check preconditions. */
-          if (! diff_allowed || desc->my_abspath)
+          if (! diff_allowed || ! desc->my_abspath)
             {
               SVN_ERR(svn_cmdline_fprintf(stderr, iterpool,
                              _("Invalid option; there's no "



Mime
View raw message