From nobody Thu Sep 08 08:46:09 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MNXlj2hYvz4bYwp; Thu, 8 Sep 2022 08:46:09 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MNXlj2Bbfz3pps; Thu, 8 Sep 2022 08:46:09 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662626769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=vv1F19nEysGESUw2aevqTC3vMN1byCsp5zKNhEY3IvY=; b=Qlv9oAQmicPBZ/wKD/Mnt1XR3F7RCmb2Nbvu2eLs8z5gKmrEqjS1QdNe3w9vuvF2JDlxpk nbDZnPO4kLdEWqYXfBn1qkjdKiIygBTgSTSRuK6GICtiS1NI5pqqtWOSpG9qnNjBihZHM5 bGQs8Sv5af5WHKRpoyq8TYyP2h4mKkqKPAMzlDDpIRke/rcvWCMnPhozQx+6pdn8MrJNbA XzgJ8pHjCk9X9eQIlO95WCYLV3DuNdOvcepDVOjakrmbZwGhXA2CT8NBaapoFnNlxxZZnM /IBrDfgVBrJA6jx126KRaK1fJ6jskgHtyrl5rj5mOIepmvTIZQ/I+Z4vnXX0xA== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 3CB0610100; Thu, 8 Sep 2022 08:46:09 +0000 (UTC) Date: Thu, 8 Sep 2022 08:46:09 +0000 From: Alexey Dokuchaev To: Stefan E??er Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: fb16dfecae4a - main - Remove WWW entries moved into port Makefiles Message-ID: References: <202209072201.287M1lXD016280@gitrepo.freebsd.org> <0bb68a6f-1e45-4b9c-e0c4-924a2b2a53f8@FreeBSD.org> List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0bb68a6f-1e45-4b9c-e0c4-924a2b2a53f8@FreeBSD.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662626769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=vv1F19nEysGESUw2aevqTC3vMN1byCsp5zKNhEY3IvY=; b=nLtmUhJ/Q9XOzOkg4aMmpczpeNj75oyj7zWv5miOp+q/wBqvqBnqIh8rVwFLXb+f9yC1uP +/xqChRcH6qEknxX3bvpfSmz4KQa+O4rxd64TKCyt0zev31zYLr/5wFaKbP9FeVoFDaAdJ dxYkNzHZmmmmpuV5pgyyrGrxVzZN5YvfxonDcortWxOlK1P83BA8ka3HJaOMEouESOHmkA v0rd0nK5kVs5NpvDmaYbBYw23XgquEya9mbfTdt/fiMgHrtGMct5jQHgt/5gWhdNd/YeDD OUoH0hBmWmuwiQXYQXWrSoHucJRoiWaIbd0GLmWr+P0r7ClW+k5w8nnROL6HKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662626769; a=rsa-sha256; cv=none; b=PnPS8Pwufxgg+A77HjmrsJiwC8riR3sQjAGrMNerMlThrszD+6pWNq8HGUDm285KqkEW4P JR8V4OtgPZyavht+vmznbDhvqp6X533YUrtXEcCR5lhOmrlV5TFRWtiXji3Hlof5kLM8bn GIqZWFkNNmwtQciL/YRkTIvB36b6fFQGvEBJxU0xT8WdW/l36n9fKNHrtmDNOo2N7iqGje 4Xc6Ge7n7lpAvS+0lg80EWB4jnvWyPhAB60f6FX7b3F9shIwBZ3kgR9xFMnm1n61KGRMVe UyjsPHmrfZgiBSkaV84rlIvZI68an77c59cB1EbIasSxgVXxBjkZdDeFjVHMuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On Thu, Sep 08, 2022 at 09:33:30AM +0200, Stefan E??er wrote: > Am 08.09.22 um 06:32 schrieb Alexey Dokuchaev: > > ... > > I think these huge commits had broken my working tree. This morning > > I've routinely "git pull"ed (had to move lots of Makefile and pkg-descr > > files to .wip suffix since it complained), but even then git failed > > the update: looks like it applied the changes ("git diff" shows tons of > > -WWW: +WWW= lines) but could not merge the commit? I have just ~1G of > > free space on this HDD, maybe that was the problem... Now "git fetch" > > returns 0, so I guess the changes are at my computer, but the HEAD > > points to 7169e48ef313. How do I manually merge and apply these WWW- > > related commits on per-category basis? I'd rather do it this way and > > by hand rather than play with "git reset" as I have lots of uncommitted > > changes lying around and I don't want to accidentally lose them. > > Hi Alexey, > > sorry for the issues this update caused for you. > > Does the following sequence of commands help: > > git stash > git fetch > git rebase > git stash pop Thanks, this worked (well, almost -- "git diff" is now empty, but at least my untracked files seem to be in place). I'll try to reapply lost changes by hand from that 600k-line diff I've saved earlier, with a little help from grep(1) et al. ./danfe