[Checkins] SVN: zc.buildout/branches/gary-6/ merge from gary-5 <- gary-4

Gary Poster gary.poster at canonical.com
Tue Feb 23 15:44:05 EST 2010


Log message for revision 109388:
  merge from gary-5 <- gary-4

Changed:
  _U  zc.buildout/branches/gary-6/
  U   zc.buildout/branches/gary-6/src/zc/buildout/easy_install.py

-=-

Property changes on: zc.buildout/branches/gary-6
___________________________________________________________________
Modified: svn:mergeinfo
   - /zc.buildout/branches/gary-5:109333-109334,109383
/zc.buildout/branches/gary-2:108913,109099
/zc.buildout/branches/gary-3:108914,109100
/zc.buildout/branches/gary-1:109098

   + /zc.buildout/branches/gary-5:109333-109334,109383,109387
/zc.buildout/branches/gary-2:108913,109099
/zc.buildout/branches/gary-3:108914,109100
/zc.buildout/branches/gary-1:109098

Modified: svk:merge
   - 62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-3:109100
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-5:109334
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-5:109383

   + 62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-3:109100
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-5:109334
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-5:109383
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-5:109387


Modified: zc.buildout/branches/gary-6/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/gary-6/src/zc/buildout/easy_install.py	2010-02-23 20:41:31 UTC (rev 109387)
+++ zc.buildout/branches/gary-6/src/zc/buildout/easy_install.py	2010-02-23 20:44:05 UTC (rev 109388)
@@ -1151,8 +1151,8 @@
     """Generate scripts and/or an interpreter.
 
     See sitepackage_safe_scripts for a version that can be used with a Python
-    that can be used with a Python that has code installed in site-packages.
-    It has more options and a different approach.
+    that has code installed in site-packages. It has more options and a
+    different approach.
     """
     path = _get_path(working_set, extra_paths)
     if initialization:



More information about the checkins mailing list