From nobody Thu Sep 8 04:32:07 2022 X-Original-To: dev-commits-ports-all@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 4MNR6b3Wq4z4c3pw; Thu, 8 Sep 2022 04:32:07 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 4MNR6b32X4z3G7K; Thu, 8 Sep 2022 04:32:07 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662611527; 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=tRZqbgPPBz1DOHSsbxSLnZzehK3n730/iikNjgbuvYw=; b=XH4Qx1XMNdQtuGLiY8x5K4H2DIloRTdSVGxH8dSvPB5wstwPFVFZtiSAOyCaUsBRoh+Yg2 4wf/u/PBw0bFbR+VKzHEchiIBAEnZqHNiX1bmP7JfXboyU9JoOT4xcriPMQNiti72HHDpj txTruKPWjxHd0yLPg2EDBKDMvL62VfyCFh0S0ewCMN5quo8fswUewrNnEzNlSaTutZb+D1 D0tGKFOtK8Zw+QNhg0NAs07prRkjpgv4/+CbUg6nOE4bGVfw9Tj6YTNgjjEwBbkVuExPHI VBbjtDJWwGAHJfxouhHKTv3a4/7BDHhqDqBFEv24xaP/ZllbWNzAZTO3SV/D4w== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 589E1F374; Thu, 8 Sep 2022 04:32:07 +0000 (UTC) Date: Thu, 8 Sep 2022 04:32:07 +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> List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202209072201.287M1lXD016280@gitrepo.freebsd.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662611527; 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=tRZqbgPPBz1DOHSsbxSLnZzehK3n730/iikNjgbuvYw=; b=OD9ur6aXBUpIyKll47PwosArCyvyg/ye4fpXBzRM6mAkB6iLNuDNP2ma83M3PugOzW4Nyz FeSSuPkVYmvTzoCT7G6FkRs9WtC/ZFqQYu7SNGkX821StLjzEx1nusv9enAtIIKwgPVMzT 5X/S/tNKJNbAPcsOL71gzvM8QMLTxY4lkO7F68H72GqaXFybE7QA1wbjlWG9DL5HgSJVPH ubUOHpHpiXJzjm28OVS7IGOvpjZwCymzM0wnuZMqo77waYKWjIDay3FaIsuvbgrinCZzM1 QzeUhEwib6fWSmunhxf1dMk+gp7IsLuE/Tw8KNAEI8XAHhuQO/L+WYkC9dfaTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662611527; a=rsa-sha256; cv=none; b=m4ZNLLqPHniW4sKdpxMt+Hr0EH6C7SBsBFomX03L6lR4UEmltttT/gMbcFHGnV/Rtu89/h mMLHK5JOOyG4EabaAHNG2UBVghT+/drxTU07PxpBcj0Za9j4Vjv7j7RNH3N1mV9Zm/wkhg rczRbnE3abIkZbxdKJX44oDeIgyunjQFURG4njGCyyIGuZIAWLNim3Fvwt0qBRPqIf3b1q xlAfRO2kHyyqB03BEVsiGSSlnuZrYeVDMrVP56Sl6OhU0hsfSVxHXP+dNmPYk69nfChBYL is6WwgU/klco5dCt+1VqXuGQIu+rE7oRCku98aGWd5xgtYzUzLOgnmOBAPgfGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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. ./danfe