Re: cannot sync - pulling is not possible because you have unmerged files

[db]

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.

Re: cannot sync - pulling is not possible because you have unmerged files

[Chris Jones]

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 could just nuke the area, and reclone it from github... Before 
that though perhaps someone else has an idea.


Chris

On 10/10/17 16:29, db wrote:

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:///opt/local/myports
DEBUG: system: /opt/local/bin/portindex /opt/local/myports
Creating port index in /opt/local/myports

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

Synchronizing local ports tree from 
file:///opt/local/var/macports/sources/github.com/macports/macports-ports/
DEBUG: euid/egid changed to: 0/80, env: HOME=/var/root 
SSH_AUTH_SOCK=/tmp/launch-9ytTKr/Listeners
DEBUG: /opt/local/bin/git pull --rebase --autostash
DEBUG: system -W 
/opt/local/var/macports/sources/github.com/macports/macports-ports: 
/opt/local/bin/git pull --rebase --autostash
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm '
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
Command failed: /opt/local/bin/git pull --rebase --autostash
Exit code: 128
DEBUG: euid/egid restored to: 0/0, env restored
DEBUG: command execution failed
 while executing
"system -W $dir $cmd"
 (procedure "macports::UpdateVCS" line 1)
 invoked from within
"macports::UpdateVCS $cmd $dir"
 ("uplevel" body line 2)
 invoked from within
"uplevel 1 $body"
Syncing local Git ports tree failed
DEBUG: Synchronization of 1 source failed
 while executing
"mportsync [array get global_options]"
port sync failed: Synchronization of 1 source failed

Re: cannot sync - pulling is not possible because you have unmerged files

[db]

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 from source four days ago, 
synced, upgraded and now cannot sync. I installed that same source on a VM and 
it syncs normally. I don't know why git status is listing those modifications.

Re: cannot sync - pulling is not possible because you have unmerged files

[Chris Jones]

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 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/port1.0/group/cmake-1.0.tcl
modified:   _resources/port1.0/group/perl5-1.0.tcl
modified:   _resources/port1.0/group/ruby-1.0.tcl
modified:   cad/gaw/Portfile
modified:   comms/hidapi-devel/Portfile
modified:   comms/telepathy-qt/Portfile
modified:   finance/cpuminer/Portfile

[…snip…]

Unmerged paths:
   (use "git reset HEAD ..." to unstage)
   (use "git add ..." to mark resolution)

both modified:   _resources/port1.0/group/cxx11-1.1.tcl
both modified:   _resources/port1.0/group/qt5-1.0.tcl
both modified:   comms/c3270/Portfile
both modified:   erlang/rebar3/Portfile
both modified:   fuse/osxfuse/Portfile
both modified:   fuse/sshfs/Portfile

[…snip…]

Re: cannot sync - pulling is not possible because you have unmerged files

[Chris Jones]

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 again.


Chris

On 10/10/17 13:10, db wrote:

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 parsed:   0
Ports successfully parsed:  0
Ports failed:   0
Up-to-date ports skipped:   69

Synchronizing local ports tree from 
file:///opt/local/var/macports/sources/github.com/macports/macports-ports/
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm '
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
Command failed: /opt/local/bin/git pull --rebase --autostash
Exit code: 128
Syncing local Git ports tree failed
port sync failed: Synchronization of 1 source failed