From owner-freebsd-git@freebsd.org  Sat May  1 19:27:24 2021
Return-Path: <owner-freebsd-git@freebsd.org>
Delivered-To: freebsd-git@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 779F5635536
 for <freebsd-git@mailman.nyi.freebsd.org>;
 Sat,  1 May 2021 19:27:24 +0000 (UTC) (envelope-from pi@freebsd.org)
Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::50:13])
 by mx1.freebsd.org (Postfix) with ESMTP id 4FXfQ431Kdz4qBD
 for <freebsd-git@freebsd.org>; Sat,  1 May 2021 19:27:24 +0000 (UTC)
 (envelope-from pi@freebsd.org)
Received: by mailman.nyi.freebsd.org (Postfix)
 id 651D46355C1; Sat,  1 May 2021 19:27:24 +0000 (UTC)
Delivered-To: git@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 64E57635535
 for <git@mailman.nyi.freebsd.org>; Sat,  1 May 2021 19:27:24 +0000 (UTC)
 (envelope-from pi@freebsd.org)
Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::4])
 (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 did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4FXfQ367pxz4q84;
 Sat,  1 May 2021 19:27:23 +0000 (UTC) (envelope-from pi@freebsd.org)
Received: from pi by fc.opsec.eu with local (Exim 4.94 (FreeBSD))
 (envelope-from <pi@freebsd.org>)
 id 1lcvGk-0009rb-G7; Sat, 01 May 2021 21:27:14 +0200
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>
References: <CAKBkRUzXAcXfFuD74VEPG0jAQBrmkQQdqAiBMR21vX3mA+4mkQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAKBkRUzXAcXfFuD74VEPG0jAQBrmkQQdqAiBMR21vX3mA+4mkQ@mail.gmail.com>
X-Rspamd-Queue-Id: 4FXfQ367pxz4q84
X-Spamd-Bar: /
Authentication-Results: mx1.freebsd.org;
	none
X-Spamd-Result: default: False [0.00 / 15.00];
 local_wl_from(0.00)[freebsd.org];
 ASN(0.00)[asn:12502, ipnet:2001:14f8::/32, country:DE]
X-BeenThere: freebsd-git@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-git/>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Help: <mailto:freebsd-git-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 May 2021 19:27:24 -0000

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 ?