Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 May 2021 21:27:14 +0200
From:      Kurt Jaeger <pi@freebsd.org>
To:        Li-Wen Hsu <lwhsu@freebsd.org>
Cc:        git@freebsd.org
Subject:   Re: Ports tree have been migrated to git
Message-ID:  <YI2rkuT2W2bpPCpR@fc.opsec.eu>
In-Reply-To: <CAKBkRUzXAcXfFuD74VEPG0jAQBrmkQQdqAiBMR21vX3mA%2B4mkQ@mail.gmail.com>
References:  <CAKBkRUzXAcXfFuD74VEPG0jAQBrmkQQdqAiBMR21vX3mA%2B4mkQ@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
Hi!

Thanks for posting more details. With some additional posts
in other places, I was finally able to understand most of the
workflow.

I even use the testing area to test commits 8-}

>  - This is still a young service, please don't treat it too
> aggressively. The testing area is at:
> 
>   https://cgit-dev.freebsd.org/ports/

But right now I'm stuck with the following problem:

I testbuild by having a default ports tree:

$ poudriere ports -l
PORTSTREE METHOD    TIMESTAMP           PATH
default   git+https 2021-05-01 21:04:04 /pou/ports/default

Right now, for reasons that are unclear to me, I still have some
local commit hanging around in that tree that I can't get removed.

I've used a lot of combinations of

git rebase
git revert
git reset

etc, short of removing and re-cloning that tree, because
I'm behind a slow DSL connection and it will take approx. 30minutes
to refetch that ports tree.

Can someone please help me understand how to just get rid of
some commit not yet pushed ?

-- 
pi@FreeBSD.org         +49 171 3101372                  Now what ?



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YI2rkuT2W2bpPCpR>