Re: git repositories and branches (was: [PATCH man-pages v4] madvise.2: ...)

[Lorenzo Stoakes <lorenzo.stoakes@oracle.com>]

On Thu, Dec 05, 2024 at 01:43:58PM +0100, Alejandro Colomar wrote:
> Hi Lorenzo,
>
> On Thu, Dec 05, 2024 at 12:26:56PM +0000, Lorenzo Stoakes wrote:
> > On Thu, Dec 05, 2024 at 01:20:37PM +0100, Alejandro Colomar wrote:
> > > Thanks for the patch!  I've applied it, with some minor tweaks.  See
> > > comments below.
> > > <https://www.alejandro-colomar.es/src/alx/linux/man-pages/man-pages.git/commit/?h=contrib&id=bb405ee3f6039226267fb1c6d2cb1fbb18d835bf>
> >
> > Thanks all seems reasonable.
> >
> > Just a quick question for future changes - I see you reference
> > git://www.alejandro-colomar.es/src/alx/linux/man-pages/man-pages.git - but
> > I've been working against
> > git://git.kernel.org/pub/scm/docs/man-pages/man-pages.git - is the latter
> > occasionally synced from the former?
>
> The 'main' branch in that server is usually at the same point that
> 'master' at <kernel.org>.  They're the same thing, just on different
> servers.
>
> Then, there's a 'contrib' branch in my server, which I use to buffer
> patches I apply from others.  That allows me to amend typos and other
> mistakes (or even drop patches) before pushing to master.
>
> Here's my workflow:
>
> 1)  I push always first to 'contrib', which triggers CI on my server,
>     and lets me know if all's good (it runs many linters set up in the
>     build system).
>
> 2)  Then I let know the contributor I've pushed there.  Then I leave it
>     there for a day or so.
>
> 3)  If I don't find anything wrong in a day or so, I push to 'main' in
>     my server, which regenerates the PDF book in my website:
>     <https://www.alejandro-colomar.es/share/dist/man-pages/git/HEAD/man-pages-HEAD.pdf>.
>
> 4)  After the PDF is generated correctly, I push to <kernel.org>'s
>     'master'.
>
> You can think of this contrib branch as a 'next' from the kernel, but I
> pull from it much more often.
>
> > Or should I be working against your
> > personal repo for future changes?
>
> Most of the time, it's enough to use the 'master' branch from
> <kernel.org>.
>
> In some cases, for example if you have several patches for a single
> page, if I have applied some of them, and you need to rebase, it would
> make sense to base on that 'contrib' branch.  Or if I have applied some
> changes recently to it and might conflict with yours, I'll ask you to
> rebase.
>
> Cheers,
> Alex

Perfect, appreciate the explanation! Thanks :)

>
> >
> > Thanks, Lorenzo
>
> --
> <https://www.alejandro-colomar.es/>