Date: Thu, 8 Sep 2022 04:32:07 +0000 From: Alexey Dokuchaev <danfe@freebsd.org> To: Stefan E??er <se@freebsd.org> 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: <YxlwR9lAS1/AsQA2@FreeBSD.org> In-Reply-To: <202209072201.287M1lXD016280@gitrepo.freebsd.org> References: <202209072201.287M1lXD016280@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YxlwR9lAS1/AsQA2>