[47777] branches/release_1_7
jmr at macports.org
jmr at macports.org
Thu Mar 5 17:27:09 PST 2009
Revision: 47777
http://trac.macports.org/changeset/47777
Author: jmr at macports.org
Date: 2009-03-05 17:27:09 -0800 (Thu, 05 Mar 2009)
Log Message:
-----------
Merge r47776 from trunk:
Don't use autoconf-provided svn path for sync, due to incompatibility between the older Apple-supplied svn and newer working copies. Fixes #15868.
Modified Paths:
--------------
branches/release_1_7/base/src/macports1.0/macports.tcl
branches/release_1_7/base/src/macports1.0/macports_autoconf.tcl.in
Property Changed:
----------------
branches/release_1_7/
branches/release_1_7/base/
Property changes on: branches/release_1_7
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46983,47034
/trunk/base:45161
+ /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46983,47034,47776
/trunk/base:45161
Property changes on: branches/release_1_7/base
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46622-46623,46983,47034
/trunk/base/base:45161
+ /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46622-46623,46983,47034,47776
/trunk/base/base:45161
Modified: branches/release_1_7/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_1_7/base/src/macports1.0/macports.tcl 2009-03-06 01:20:28 UTC (rev 47776)
+++ branches/release_1_7/base/src/macports1.0/macports.tcl 2009-03-06 01:27:09 UTC (rev 47777)
@@ -1446,7 +1446,7 @@
{^file$} {
set portdir [macports::getportdir $source]
if {[file exists $portdir/.svn]} {
- set svn_commandline "[macports::findBinary svn ${macports::autoconf::svn_path}] update --non-interactive ${portdir}"
+ set svn_commandline "[macports::findBinary svn] update --non-interactive ${portdir}"
ui_debug $svn_commandline
if {
[catch {
Modified: branches/release_1_7/base/src/macports1.0/macports_autoconf.tcl.in
===================================================================
--- branches/release_1_7/base/src/macports1.0/macports_autoconf.tcl.in 2009-03-06 01:20:28 UTC (rev 47776)
+++ branches/release_1_7/base/src/macports1.0/macports_autoconf.tcl.in 2009-03-06 01:27:09 UTC (rev 47777)
@@ -35,7 +35,6 @@
variable macports_conf_path "@MPCONFIGDIR_EXPANDED@"
variable macports_version "@MP_VERSION@"
variable macports_user_dir "~/.macports"
- variable svn_path "@SVN@"
variable rsync_path "@RSYNC@"
variable open_path "@OPEN@"
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090305/eb480306/attachment.html>
More information about the macports-changes
mailing list