subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1147407 - in /subversion/branches/1.7.x: ./ Makefile.in STATUS
Date Sat, 16 Jul 2011 11:50:54 GMT
Author: hwright
Date: Sat Jul 16 11:50:53 2011
New Revision: 1147407

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

 * r1146904
   Fix the 'extraclean' target of the Makefile to remove config.{guess,sub}
   Justification:
     1.6 removes these.
   Votes:
     +1: arfrever, philip, julianfoad

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/Makefile.in
    subversion/branches/1.7.x/STATUS

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 16 11:50:53 2011
@@ -53,4 +53,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146219,1146222,1146274,1146492,1146555,1146620,1146684,1146832,1146834,1146899
+/subversion/trunk:1146013,1146219,1146222,1146274,1146492,1146555,1146620,1146684,1146832,1146834,1146899,1146904

Modified: subversion/branches/1.7.x/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/Makefile.in?rev=1147407&r1=1147406&r2=1147407&view=diff
==============================================================================
--- subversion/branches/1.7.x/Makefile.in (original)
+++ subversion/branches/1.7.x/Makefile.in Sat Jul 16 11:50:53 2011
@@ -396,13 +396,15 @@ local-extraclean: local-distclean extrac
               $(top_srcdir)/subversion/svn_private_config.h.in \
               $(top_srcdir)/configure \
               $(top_srcdir)/gen-make.opts \
-              $(top_srcdir)/build/transform_libtool_scripts.sh \
+              $(top_srcdir)/build/config.guess \
+              $(top_srcdir)/build/config.sub \
               $(top_srcdir)/build/libtool.m4 \
               $(top_srcdir)/build/ltoptions.m4 \
               $(top_srcdir)/build/ltsugar.m4 \
               $(top_srcdir)/build/ltversion.m4 \
               $(top_srcdir)/build/lt~obsolete.m4 \
               $(top_srcdir)/build/ltmain.sh \
+              $(top_srcdir)/build/transform_libtool_scripts.sh \
               $(EXTRACLEAN_FILES)
 
 

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1147407&r1=1147406&r2=1147407&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Jul 16 11:50:53 2011
@@ -45,13 +45,6 @@ Candidate changes:
 Approved changes:
 =================
 
- * r1146904
-   Fix the 'extraclean' target of the Makefile to remove config.{guess,sub}
-   Justification:
-     1.6 removes these.
-   Votes:
-     +1: arfrever, philip, julianfoad
-
  * r1146781
    Fix a bug in subtree merging.  See email thread by Barry Scott, 2011-07-02,
    "Assert in svn-1.7-alpha2 svn_client_merge3",



Mime
View raw message