From: Landry Breuil <landry@openbsd.org>
Subject: Re: Lost among the branches
To: Christian Weisgerber <naddy@mips.inka.de>
Cc: gameoftrees@openbsd.org
Date: Tue, 16 May 2023 09:33:15 +0200

Le Mon, May 15, 2023 at 05:37:27PM +0200, Christian Weisgerber a écrit :
> I have found a new toy to probe the limits of GoT:
> https://github.com/mozilla/gecko-dev
> 
> I would like to update my worktree to a commit found somewhere in
> the convoluted (merge, merge) history of the current branch:
> 
>   $ cd gecko-dev
>   $ got br
>   release
>   $ got log -b -S FIREFOX_112_0_RELEASE
>   -----------------------------------------------
>   commit 51aeebd8221e07415c275453ebe88cce39e151ce
>   from: Mozilla Releng Treescript <release+treescript@mozilla.org>
>   date: Tue Apr 11 12:40:50 2023 UTC
>    
>    No bug - Tagging d2b2ff2c6e3ceb267e77b0163c860f7a1f13ff4a with FIREFOX_112_0_RELEASE a=release CLOSED TREE DONTBUILD
>    
>   $ got up -c 51aeebd8221e07415c275453ebe88cce39e151ce
>   got: work tree's head reference now points to a different branch; new head reference and/or update -b required
> 
> Aaand I'm lost.  What now?  The commit is in the branch's history,
> so why can't I go there?  update -b <what>??

Fwiw, i dunno if that matters, but gecko-dev git repo comes from a
hg-git conversion from all the mercurial official repositories at
https://hg.mozilla.org/.. the official DVCS at mozilla still being
mercurial (to my great dismay), and ppl can use 'git-cinnabar' to work
with git against the mercurial repo.

i *think* it's still done with hg-git those days, per
https://gregoryszorc.com/blog/2013/04/14/making-hg-git-faster/

And yes, it's another good example of 'pushing the limits'.
Sorry naddy for pushing you in that nightmare :)

Landry