Re: Rejiggering the branches

2021-07-14 Thread Robert Goldman
On 14 Jul 2021, at 16:58, Raymond Toy wrote: If there are tags (or branches) to indicate when the release is done, then a stable branch is ok with me.  I just want a way to get to a release somehow.  (Not that I've had to debug an issue in asdf.  But if I did, I want to be able to extract

Re: Rejiggering the branches

2021-07-13 Thread Robert Goldman
On 13 Jul 2021, at 10:20, Eric Timmons wrote: Attila Lendvai writes: what i would do: - one branch that holds the bleeding edge. i'd call it main, just to go with the flow. - branches for ASDF versions (down to the desired resolution, probably major.minor), so that you can

Re: Rejiggering the branches

2021-07-13 Thread Attila Lendvai
> > Nah, a tag is supposed to never change. The mechanism for a "tag that > changes" is called... a branch. the user story that i desire is a label that someone with the commit bit can move around freely, and then it gets automatically synchronized to everyone else who pulls/fetches the repo

Re: Rejiggering the branches

2021-07-13 Thread Eric Timmons
Attila Lendvai writes: > what i would do: > >- one branch that holds the bleeding edge. i'd call it main, just to go >with the flow. >- branches for ASDF versions (down to the desired resolution, probably >major.minor), so that you can easily cherry pick or backport fixes into >

Re: Rejiggering the branches

2021-07-13 Thread Faré
On Tue, Jul 13, 2021 at 9:34 AM Attila Lendvai wrote: >> >> >> Would the "stable" branch be any different from the "release" branch? >> If it's actually a not-so-stable development branch for 3.3 while a >> separate branch contains development for 3.4, then maybe indeed >> calling branches v3.3

Re: Rejiggering the branches

2021-07-13 Thread Attila Lendvai
> > > Would the "stable" branch be any different from the "release" branch? > If it's actually a not-so-stable development branch for 3.3 while a > separate branch contains development for 3.4, then maybe indeed > calling branches v3.3 and v3.4 make more sense. > > +1 what i would do: - one

Re: Rejiggering the branches

2021-07-12 Thread phoebe Goldman
> Just like Debian has stable and testing, but the precise meaning of these > changes over time. > If your intention is to do the same thing as Debian, why not use the same names, too? > On Jul 12, 2021, at 2:56 PM, Robert Goldman wrote: > > On 12 Jul 2021, at 13:36, Faré wrote: > > Would

Re: Rejiggering the branches

2021-07-12 Thread Robert Goldman
On 12 Jul 2021, at 13:36, Faré wrote: Would the "stable" branch be any different from the "release" branch? If it's actually a not-so-stable development branch for 3.3 while a separate branch contains development for 3.4, then maybe indeed calling branches v3.3 and v3.4 make more sense. Yes,

Re: Rejiggering the branches

2021-07-12 Thread Faré
Would the "stable" branch be any different from the "release" branch? If it's actually a not-so-stable development branch for 3.3 while a separate branch contains development for 3.4, then maybe indeed calling branches v3.3 and v3.4 make more sense. —♯ƒ • François-René ÐVB Rideau •Reflection•

Re: Rejiggering the branches

2021-07-12 Thread Robert Dodier
On Mon, Jul 12, 2021 at 10:52 AM Rudolf Schlatte wrote: > In the first email you said that the purpose of that branch was to > permit continuation of the 3.3 release series, so maybe call the branch > "v3.3"? That way, there can be multiple such branches without resorting > to "stable",

Re: Rejiggering the branches

2021-07-12 Thread Martin Simmons
> On Mon, 12 Jul 2021 19:52:01 +0200, Rudolf Schlatte said: > Cancel-Lock: sha1:dqYu7Py9JNAyZJWALyW1kLx3PD8= > > "Robert Goldman" > writes: > > > If stable seems bad, is there another name we could use to avoid renaming? > > Like maint for "maintenance"? > > > > I don't love maint, because

Re: Rejiggering the branches

2021-07-12 Thread Rudolf Schlatte
"Robert Goldman" writes: > If stable seems bad, is there another name we could use to avoid renaming? > Like maint for "maintenance"? > > I don't love maint, because it's too close to main, and it seems like main > has an edge in familiarity if not in meaningfulness. > > legacy? > > Unless we

Re: Rejiggering the branches

2021-07-12 Thread Robert Goldman
If `stable` seems bad, is there another name we could use to avoid renaming? Like `maint` for "maintenance"? I don't love `maint`, because it's too close to `main`, and it seems like `main` has an edge in familiarity if not in meaningfulness. `legacy`? Unless we can come up with something

Re: Rejiggering the branches

2021-07-12 Thread Martin Simmons
> On Mon, 12 Jul 2021 08:59:16 -0500, Robert Goldman said: > > As we move forward, and try to add some new facilities to ASDF, this > seems like a good time to revise the branching structure that we use. > > In particular, I would like to add a `stable` branch that will permit >

Re: Rejiggering the branches

2021-07-12 Thread Raymond Toy
I'd prefer main over dev. Mostly because github has (forcibly) renamed master to main (along with other projects) so I'm used to main being what master used to be. Having to remember master, main, and dev is just too much work for my old brain. On Mon, Jul 12, 2021 at 7:34 AM Robert Goldman

Re: Rejiggering the branches

2021-07-12 Thread Phoebe Goldman
I prefer dev over main, since it’s more clear about the purpose of the branch. Main is just not a very descriptive word. For one thing, for most people, stable will actually be the “main” branch. This isn’t a strong preference, but honestly I doubt anyone has that strong of feelings on the

Rejiggering the branches

2021-07-12 Thread Robert Goldman
As we move forward, and try to add some new facilities to ASDF, this seems like a good time to revise the branching structure that we use. In particular, I would like to add a `stable` branch that will permit continuation of the 3.3 release series, the need for which is illustrated by Mark