Hi, To answer my own question, yes, I was missing something really simple. On May 30, 2007, at 1:31 PM, Gregory Wright wrote:
Hi James,
On May 30, 2007, at 12:32 PM, James Berry wrote:
Hi Greg,
Did you have any local changes to darwinports.tcl? The ".mine" looks suspiciously like the diff text that svn inserts for a merge conflict. Can you take a look at that file?
Good point. I had no local changes that I could recall, so I deleted everything in base/, re-updated, rebuilt and reinstalled, but I get the same error.
From base/ I searched for the string ".mine" with result:
crossroads-able> find . -type f | xargs grep "\.mine" ./src/.svn/text-base/thread2.6.diff.svn-base:diff -ru src/thread2.6/ Makefile.in src/thread2.6.mine/Makefile.in ./src/.svn/text-base/thread2.6.diff.svn-base:+++ src/thread2.6.mine/ Makefile.inMon Apr 17 02:42:43 2006 ./src/.svn/text-base/thread2.6.diff.svn-base:diff -ru src/thread2.6/ configure src/thread2.6.mine/configure ./src/.svn/text-base/thread2.6.diff.svn-base:+++ src/thread2.6.mine/ configure Mon Apr 17 02:27:46 2006 ./src/.svn/text-base/thread2.6.diff.svn-base:diff -ru src/thread2.6/ lib/ttrace.tcl src/thread2.6.mine/lib/ttrace.tcl ./src/.svn/text-base/thread2.6.diff.svn-base:+++ src/thread2.6.mine/ lib/ttrace.tcl Mon Apr 17 02:27:46 2006 ./src/thread2.6.diff:diff -ru src/thread2.6/Makefile.in src/ thread2.6.mine/Makefile.in ./src/thread2.6.diff:+++ src/thread2.6.mine/Makefile.in Mon Apr 17 02:42:43 2006 ./src/thread2.6.diff:diff -ru src/thread2.6/configure src/ thread2.6.mine/configure ./src/thread2.6.diff:+++ src/thread2.6.mine/configure Mon Apr 17 02:27:46 2006 ./src/thread2.6.diff:diff -ru src/thread2.6/lib/ttrace.tcl src/ thread2.6.mine/lib/ttrace.tcl ./src/thread2.6.diff:+++ src/thread2.6.mine/lib/ttrace.tcl Mon Apr 17 02:27:46 2006 crossroads-able>
Am I missing something really simple?
This can be caused by a bad PortIndex file. It turns out that when I was away (and off the net) I made some changes and had to do a portindex. Updating my tree this morning gave conflicts. The solution was to delete all of the PortIndex.* files and redo the portindex. Now everything is happy. Greg