Opened 12 years ago

Closed 12 years ago

Last modified 12 years ago

#31644 closed defect (fixed)

port -d sync fails on port tree after Subversion 1.7 update

Reported by: snowflake (Dave Evans) Owned by: macports-tickets@…
Priority: Normal Milestone: MacPorts 2.1.0
Component: base Version: 2.0.99
Keywords: Cc: ak.ml@…, ryandesign (Ryan Carsten Schmidt)
Port:

Description

I have two ports trees fetched with Subversion - the Macports tree and the feiri.eu tree

The macports tree no longer updates with port -d sync, instead I have to do it manually with Subversion. This started happening after Subversion was upgraded to 1.7

Subversion no longer has .svn directories in each directory of the ports tree. Instead there is one .svn at the base of the trunk tree, which in my case also includes the Macports tcl source files and documentation.

Looking at the source in base/src/macports1.0/macports.tcl, there is a check for the existence of a .svn directory. It's not there anymore, so Subversion is never used.

Here's the output of a port -d sync

svn is only called for the macports.feiri.eu tree

Script started on Mon Oct 17 17:07:10 2011
DEBUG: Synchronizing ports tree(s)
DEBUG: Skipping file:///Users/davidevans/localports/
Synchronizing local ports tree from file:///Users/davidevans/macports.feiri.eu
DEBUG: /opt/local/bin/svn update --non-interactive /Users/davidevans/macports.feiri.eu
Updating '/Users/davidevans/macports.feiri.eu':
Skipped '/Users/davidevans/macports.feiri.eu/PortIndex.quick' -- Node remains in conflict
Skipped '/Users/davidevans/macports.feiri.eu/PortIndex' -- Node remains in conflict
At revision 530.
Summary of conflicts:
  Skipped paths: 2
Creating port index in /Users/davidevans/macports.feiri.eu

Total number of ports parsed:	0 
Ports successfully parsed:	0 
Ports failed:			0 
Up-to-date ports skipped:	19

Synchronizing local ports tree from file:////Users/davidevans/macports/svn-repo/macports-trunk/dports/
Creating port index in /Users/davidevans/macports/svn-repo/macports-trunk/dports

Total number of ports parsed:	0 
Ports successfully parsed:	0 
Ports failed:			0 
Up-to-date ports skipped:	12350


Script done on Mon Oct 17 17:07:15 2011

Attachments (1)

patch-macports.tcl.diff (851 bytes) - added by ak.ml@… 12 years ago.

Download all attachments as: .zip

Change History (7)

comment:1 Changed 12 years ago by ak.ml@…

Cc: ak.ml@… added

Cc Me!

comment:2 Changed 12 years ago by ak.ml@…

I think you're right about the .svn check.

My suggestion would be to replace the .svn check with a check on the exit status of:

svn info ${portdir}

See the attached patch.

Changed 12 years ago by ak.ml@…

Attachment: patch-macports.tcl.diff added

comment:3 in reply to:  2 Changed 12 years ago by snowflake (Dave Evans)

Replying to ak.ml@…:

See the attached patch.

Your patch works.

comment:4 Changed 12 years ago by jmroot (Joshua Root)

Milestone: MacPorts Future
Resolution: fixed
Status: newclosed

This was fixed in r86872.

comment:5 Changed 12 years ago by jmroot (Joshua Root)

Milestone: MacPorts FutureMacPorts 2.1.0

comment:6 Changed 12 years ago by ryandesign (Ryan Carsten Schmidt)

Cc: ryandesign@… added

Has duplicate #33573.

Note: See TracTickets for help on using tickets.