| 1 |
On Saturday 15 Jul 2017 12:14:52 Daniel Wagener wrote: |
| 2 |
> On Sat, 15 Jul 2017 11:00:01 +0100 |
| 3 |
> |
| 4 |
> Peter Humphrey <peter@××××××××××××.uk> wrote: |
| 5 |
> > Hello list, |
| 6 |
> > |
| 7 |
> > Today I get this: |
| 8 |
> > |
| 9 |
> > # emerge --sync |
| 10 |
> > |
| 11 |
> > >>> Syncing repository 'gentoo' into '/usr/portage'... |
| 12 |
> > |
| 13 |
> > /usr/bin/git pull |
| 14 |
> > remote: Counting objects: 25, done. |
| 15 |
> > remote: Compressing objects: 100% (9/9), done. |
| 16 |
> > remote: Total 25 (delta 15), reused 25 (delta 15), pack-reused 0 |
| 17 |
> > Unpacking objects: 100% (25/25), done. |
| 18 |
> > From https://github.com/gentoo-mirror/gentoo |
| 19 |
> > |
| 20 |
> > c80ef88a736..b9cb9e0b42e stable -> origin/stable |
| 21 |
> > |
| 22 |
> > Updating c5ec29f674c..b9cb9e0b42e |
| 23 |
> > error: Your local changes to the following files would be overwritten |
| 24 |
> > |
| 25 |
> > by merge: |
| 26 |
> > metadata/layout.conf |
| 27 |
> > |
| 28 |
> > Please commit your changes or stash them before you merge. |
| 29 |
> > Aborting |
| 30 |
> > !!! git pull error in /usr/portage |
| 31 |
> > |
| 32 |
> > I can't imagine I'd ever make any changes to that file, especially |
| 33 |
> > not using git, but I tried reverting to backups of /var |
| 34 |
> > and /usr/portage from a week ago, but I still get the same error. |
| 35 |
> > Using backups from two weeks ago also made no difference. |
| 36 |
> > |
| 37 |
> > I sync and update every day, with never a problem like this before. |
| 38 |
> > |
| 39 |
> > Can anyone see what else I should try? Should I just delete the |
| 40 |
> > offending file? (I'll get some coffee meanwhile...) |
| 41 |
> |
| 42 |
> Why not just go there and do a "git diff"? |
| 43 |
> It will show you what changed – maybe that gives an Idea what happened |
| 44 |
|
| 45 |
It showed me that I'd changed "masters =" to "masters = gentoo" in |
| 46 |
layout.conf, which I knew because I'd been told to at some time. But I did |
| 47 |
that ages ago, long before my last sync yesterday, so what else has changed? |
| 48 |
I didn't emerge anything yesterday, as confirmed by "grep completed |
| 49 |
/var/log/emerge.log" (so it wasn't a failed emerge, Alexander). |
| 50 |
|
| 51 |
> "git reset --hard" to reset the repository should solve that problem. |
| 52 |
|
| 53 |
It has - thanks Daniel. I haven't tried to understand the ins and outs of |
| 54 |
git, I just use it blindly for --sync. |
| 55 |
|
| 56 |
-- |
| 57 |
Regards |
| 58 |
Peter |
Archives