On 10 Oct 2017, at 17:49, Rainer Müller wrote:
> git reset --hard
> git clean --force
That worked, but the question remains. Is there anything in port that could
have messed the repo? Maybe an incomplete sync?
On 2017-10-10 17:05, db wrote:
> On 10 Oct 2017, at 15:17, Chris Jones wrote:
>> So one or more of those modifications are your problem. The modifications in
>> your checkout conflict with something coming in from the sync. You need to
>> resolve these conflicts before trying again.
>
> I didn'
On Oct 10, 2017, at 11:48 AM, db wrote:
> On 10 Oct 2017, at 17:42, "Daniel J. Luke" wrote:
>> If the OP does have a need to be syncing from the git repository, he should
>> be able to manage any conflicts like this without help from the list.
>
> As I said, I didn't modify the checkout.
somet
On 10 Oct 2017, at 17:42, "Daniel J. Luke" wrote:
> If the OP does have a need to be syncing from the git repository, he should
> be able to manage any conflicts like this without help from the list.
As I said, I didn't modify the checkout.
On Oct 10, 2017, at 11:40 AM, Chris Jones wrote:
> Maybe you could just nuke the area, and reclone it from github... Before that
> though perhaps someone else has an idea.
If the OP doesn't have a need to be syncing from the git repository, it would
make sense to just change the config back to
OK, that didn't help much.
What is going wrong is clear. You have modifications in
/opt/local/var/macports/sources/github.com/macports/macports-ports that
are in conflict with the main repo and conflict when pulled in. *Why*
you have these modifications, I cannot help you with...
Maybe you
On 10 Oct 2017, at 17:20, Chris Jones wrote:
> > sudo port -d sync
$ sudo port -d sync
Password:
DEBUG: Copying /Users/user/Library/Preferences/com.apple.dt.Xcode.plist to
/opt/local/var/macports/home/Library/Preferences
---> Updating the ports tree
Synchronizing local ports tree from file:///o
run 'git diff' on the changes to see if anything rings a bell.
Failing that I have no idea. I have never had conflicts like that apart
from when I had uncommitted changes.
Maybe you could run
> sudo port -d sync
and post what that says. It should contain a bit more debug..
On 10/10/17 16:0
On 10 Oct 2017, at 15:17, Chris Jones wrote:
> So one or more of those modifications are your problem. The modifications in
> your checkout conflict with something coming in from the sync. You need to
> resolve these conflicts before trying again.
I didn't modify the checkout: I installed base
So one or more of those modifications are your problem. The
modifications in your checkout conflict with something coming in from
the sync. You need to resolve these conflicts before trying again.
On 10/10/17 14:15, db wrote:
On 10 Oct 2017, at 15:08, Chris Jones wrote:
git status
$ git
On 10 Oct 2017, at 15:08, Chris Jones wrote:
> > git status
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD ..." to unstage)
modified: _resources/port1.0/fetch/mirror_sites.tcl
modified: _resources
what does
> cd /opt/local/var/macports/sources/github.com/macports/macports-ports
> git status
give ? (might need sudo on that last one)
On 10/10/17 14:04, db wrote:
On 10 Oct 2017, at 14:48, Chris Jones wrote:
Looks like you have made some modifications to the ports in your local git
check
On 10 Oct 2017, at 14:48, Chris Jones wrote:
> Looks like you have made some modifications to the ports in your local git
> checkout which conflict with what is being pulled in during the sync.
I git clone'd master and built base, nothing more. It sync'ed a couple of days
ago. Now, after buildi
Hi,
This is git, nothing to do with macports.
Looks like you have made some modifications to the ports in your local
git checkout which conflict with what is being pulled in during the
sync. You need to go into your git checkout and fix the conflicts,
whatever they are, by hand before trying
I cannot synchronize the ports tree. Four days ago I installed master from same
day, October 16th. I now get this error
$ sudo port -v sync
---> Updating the ports tree
Synchronizing local ports tree from file:///opt/local/myports
Creating port index in /opt/local/myports
Total number of ports
15 matches
Mail list logo
