Re: git: fb16dfecae4a - main - Remove WWW entries moved into port Makefiles

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