From nobody Thu Sep 08 07:33:30 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 4MNW7w6DRtz4bPxN; Thu, 8 Sep 2022 07:33:32 +0000 (UTC) (envelope-from se@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MNW7w5dcdz3bc9; Thu, 8 Sep 2022 07:33:32 +0000 (UTC) (envelope-from se@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662622412; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X4NzV5p3odeNb304jDdOx1NDW5v1KxpYK/XnSYjyqSo=; b=Tz7PyMgP8wU24qHDli52Cw4x8e5fdqzK0nUWG/XB/9mwVBTaORFDhIVhf8KZWJJ3PCatbP WMmqJxH0gOW6Pj8wJDfDIVKXTTS3te5gqv9taixBzmV6Px1kQaIx9ytug0WLaeUGqN0nPH dezoJjJYO/yWR6aGW7P71QKgKkv/xYNDGkWO6XHevlkcINLS121HN407YvsKGoAK5c5036 PXdMmdSNFIRbzOHQJ0NxXi8I1p8Mx4w8KHIGYVX8dhL9ZImuey/OVjRb2737mAeehl6bqy 4i1s2PNhtPnAti9u/h/Ap2rt8U+hko6uOj9IdqOpTN96u5RaeYTeI4aLXSzkZA== Received: from [IPV6:2003:cd:5f1e:4500:cb:97ea:97aa:d70a] (p200300cd5f1e450000cb97ea97aad70a.dip0.t-ipconnect.de [IPv6:2003:cd:5f1e:4500:cb:97ea:97aa:d70a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: se/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4MNW7w0GX6z173P; Thu, 8 Sep 2022 07:33:31 +0000 (UTC) (envelope-from se@freebsd.org) Message-ID: <0bb68a6f-1e45-4b9c-e0c4-924a2b2a53f8@FreeBSD.org> Date: Thu, 8 Sep 2022 09:33:30 +0200 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 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.2.1 From: Stefan E??er Subject: Re: git: fb16dfecae4a - main - Remove WWW entries moved into port Makefiles Content-Language: de-DE, en-US To: Alexey Dokuchaev Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org References: <202209072201.287M1lXD016280@gitrepo.freebsd.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662622412; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X4NzV5p3odeNb304jDdOx1NDW5v1KxpYK/XnSYjyqSo=; b=W0IYs6b82+UQrLFZLrnAwu105nwMdZ6TaphevDN/me28xkoKXoz3JiVQU8PRK5tyVR9yVm J4saYrCjUNxQZ9xbRw1kXcv8SD5hYQygzO2Y3fDLdz/GuIudQPMUp89hF8iF00oBzDnU7R V75jJb5vOSFdrXRRk/kDdvPCFxyZXM/BRsJc707YufZ7YG/7ZX4PGgZdBaM/s4loqdZMjk Y+c3/M/JAsUsJsmMwiF21hQXboSFgYFr+jjKY+rxq/ByvvBMQWaNeyxuobq5wBdbepUOf4 nJECE4I8ZdkuMdHmJ1begUXEWzyBRVK4ongjAh8L2cWhfZfnVmnN0CutWwW+rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662622412; a=rsa-sha256; cv=none; b=faiQ+siPCXzsIn5pOn4GB4HI3KlsNmyzDEE5xEKXYuZAdudFzwJyw5CLlsBYkoDmtrjegi qF7aroO4Nty2gVYlHoLb5+Z0IFyLQEQpNeQhrjY1aBYrQN2j+uNSOcu4b98YH1evLWZzXp 2l3K4helxmZlkeq5MbDjRhwglPmlCfNNVqRUKUCXTdOu90Fndqsc5usPGsTXyMYcLM2OTF uwm5XODcllGW0xa6535QeUR+P/Wy9XDmCs2SruK7Q6twK/7OFxBWvdOItiMCmNJ7yrF3/Y 6LN/XCpCQA6eqQAXsvuht3pZZvytDO7m6NSZ4TVVOPbFlef2oymIcxn9fhAp1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N Am 08.09.22 um 06:32 schrieb Alexey Dokuchaev: > On Wed, Sep 07, 2022 at 10:01:47PM +0000, Stefan E??er wrote: >> commit fb16dfecae4a6efac9f3a78e0b759fb7a3c53de4 >> >> Remove WWW entries moved into port Makefiles >> >> Commit b7f05445c00f has added WWW entries to port Makefiles based >> on WWW: lines in pkg-descr files. >> >> This commit removes the WWW: lines of moved-over URLs from these >> pkg-descr files. > > Hi there, > > 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 You may have conflicts after "git stash pop" ends, but those should be relatively easy to fix (in most cases just accept the added WWW line). You can use "git diff b7f05445c00f^..b7f05445c00f" to generate a diff that covers all the changes applied in this commit. If you limit the context range to 1 line, the resulting patch should still work, since the "WWW" lines should all immediately follow the "COMMENT" line. If you still cannot get this issue resolved, I'll try to work out a solution with you. Regards, STefan