Am Samstag, 15. Juli 2017, 15:11:03 CEST schrieb Peter Humphrey: > On Saturday 15 Jul 2017 12:14:52 Daniel Wagener wrote: > > On Sat, 15 Jul 2017 11:00:01 +0100 > > > > Peter Humphrey <pe...@prh.myzen.co.uk> wrote: [...] > > > > Why not just go there and do a "git diff"? > > It will show you what changed – maybe that gives an Idea what happened > > It showed me that I'd changed "masters =" to "masters = gentoo" in > layout.conf, which I knew because I'd been told to at some time.
That's ridiculous. You're configuring the main portage tree to be a master of itself. Search for "masters" in portage(5) for an explanation of what that option is for (it's mainly interesting for overlays). > But I did > that ages ago, long before my last sync yesterday, so what else has changed? > I didn't emerge anything yesterday, as confirmed by "grep completed > /var/log/emerge.log" (so it wasn't a failed emerge, Alexander). What probably happened is that this is the first time something changed in layout.conf since you added the "masters" line, thus why git never complained. > > "git reset --hard" to reset the repository should solve that problem. > > It has - thanks Daniel. I haven't tried to understand the ins and outs of > git, I just use it blindly for --sync. Since git is a version control system, it won't blindly overwrite local changes, so it's best not to make any :) (so don't add that change back in, since it's pointless anyway). Always use your own overlay if you want to make changes. HTH -- Marc Joliet -- "People who think they know everything really annoy those of us who know we don't" - Bjarne Stroustrup
signature.asc
Description: This is a digitally signed message part.
