subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1400361 - in /subversion/branches/1.7.x: ./ STATUS subversion/svn/log-cmd.c
Date Sat, 20 Oct 2012 04:03:28 GMT
Author: svn-role
Date: Sat Oct 20 04:03:28 2012
New Revision: 1400361

URL: http://svn.apache.org/viewvc?rev=1400361&view=rev
Log:
Merge r1398100 from trunk:

 * r1398100
   Add missing 'prop-mods' and 'text-mods' attributes in the changed paths
   section of the output of 'log -v --xml'.  When these attributes were
   added in 1.7.0 they were accidentally only included for copied paths.
   Justification:
     Simple fix. Seems unlikely to cause harm.
   Votes:
     +1: julianfoad, cmpilato, danielsh

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/svn/log-cmd.c

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1398100

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1400361&r1=1400360&r2=1400361&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Oct 20 04:03:28 2012
@@ -94,12 +94,3 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1398100
-   Add missing 'prop-mods' and 'text-mods' attributes in the changed paths
-   section of the output of 'log -v --xml'.  When these attributes were
-   added in 1.7.0 they were accidentally only included for copied paths.
-   Justification:
-     Simple fix. Seems unlikely to cause harm.
-   Votes:
-     +1: julianfoad, cmpilato, danielsh
-

Modified: subversion/branches/1.7.x/subversion/svn/log-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/svn/log-cmd.c?rev=1400361&r1=1400360&r2=1400361&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/svn/log-cmd.c (original)
+++ subversion/branches/1.7.x/subversion/svn/log-cmd.c Sat Oct 20 04:03:28 2012
@@ -464,7 +464,13 @@ log_entry_receiver_xml(void *baton,
               /* <path action="X"> */
               svn_xml_make_open_tag(&sb, pool, svn_xml_protect_pcdata, "path",
                                     "action", action,
-                                    "kind", svn_cl__node_kind_str_xml(log_item->node_kind),
NULL);
+                                    "kind", svn_cl__node_kind_str_xml(
+                                                     log_item->node_kind),
+                                    "text-mods", svn_tristate__to_word(
+                                                     log_item->text_modified),
+                                    "prop-mods", svn_tristate__to_word(
+                                                     log_item->props_modified),
+                                    NULL);
             }
           /* xxx</path> */
           svn_xml_escape_cdata_cstring(&sb, path, pool);



Mime
View raw message