<div dir="ltr"><div dir="ltr"><div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small"><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Jul 13, 2021 at 1:35 PM Robert Goldman <<a href="mailto:rpgoldman@sift.info">rpgoldman@sift.info</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><u></u>
<div>
<div style="font-family:sans-serif"><div style="white-space:normal">
<p dir="auto">On 13 Jul 2021, at 10:20, Eric Timmons wrote:</p>
</div>
<div style="white-space:normal"><blockquote style="border-left:2px solid rgb(119,119,119);color:rgb(119,119,119);margin:0px 0px 5px;padding-left:5px"><p dir="auto">Attila Lendvai <<a href="mailto:attila.lendvai@gmail.com" target="_blank">attila.lendvai@gmail.com</a>> writes:</p>
<blockquote style="border-left:2px solid rgb(153,153,153);color:rgb(153,153,153);margin:0px 0px 5px;padding-left:5px"><p dir="auto">what i would do:<br>
<br>
- one branch that holds the bleeding edge. i'd call it main, just to go<br>
with the flow.<br>
- branches for ASDF versions (down to the desired resolution, probably<br>
major.minor), so that you can easily cherry pick or backport fixes into<br>
them. a new version-branch is forked off of main whenever a release happens.<br>
- optionally a stable *tag* as an indirection to the latest release. it<br>
communicates which specific git revision is it that the maintainer<br>
considers the stable state at any moment in time. it comes handy e.g. in CI<br>
scripts that want to check out the latest ASDF release, etc...<br>
</p>
</blockquote><p dir="auto">I like this!<br>
<br>
IMO a big win of having the major and minor number in the branch name is<br>
that it's a better experience for users. If it's a single `maintenance`<br>
branch then a git pull may wind up changing their version completely. If<br>
they have any local changes as well, things might get a bit hairy when<br>
`maintenance` changes minor versions as that wouldn't be a fast-forward<br>
update.</p>
</blockquote></div>
<div style="white-space:normal">
<p dir="auto">I guess I'm surprised you say this. I don't <i>ever</i> want us to have more than a single live maintenance branch. I absolutely <i>never</i> want to support more than a single <code style="background-color:rgb(247,247,247);border-radius:3px;margin:0px;padding:0px 0.4em" bgcolor="#F7F7F7">main</code> version and a single <code style="background-color:rgb(247,247,247);border-radius:3px;margin:0px;padding:0px 0.4em" bgcolor="#F7F7F7">stable</code> version.</p>
<p dir="auto">So, to me, it's a <i>feature</i> that if you git pull maintenance and you find out that what you are maintaining has changed. And to me it seems like a <i>bad</i> user experience if I can end up wasting my time interacting with a branch that is obsolete and of no further interest. I'd rather know that things have changed -- and I would expect to do <code style="background-color:rgb(247,247,247);border-radius:3px;margin:0px;padding:0px 0.4em" bgcolor="#F7F7F7">git pull --ff-only</code> on <code style="background-color:rgb(247,247,247);border-radius:3px;margin:0px;padding:0px 0.4em" bgcolor="#F7F7F7">stable</code>.</p>
<p dir="auto">I am surprised that so many people want to have a branch like <code style="background-color:rgb(247,247,247);border-radius:3px;margin:0px;padding:0px 0.4em" bgcolor="#F7F7F7">v3.3</code>. This adds a memory burden that <code style="background-color:rgb(247,247,247);border-radius:3px;margin:0px;padding:0px 0.4em" bgcolor="#F7F7F7">stable</code> doesn't have, in the same way that Raymond pointed out that having <code style="background-color:rgb(247,247,247);border-radius:3px;margin:0px;padding:0px 0.4em" bgcolor="#F7F7F7">dev</code> adds a memory burden beyond using the standard <code style="background-color:rgb(247,247,247);border-radius:3px;margin:0px;padding:0px 0.4em" bgcolor="#F7F7F7">main</code> or <code style="background-color:rgb(247,247,247);border-radius:3px;margin:0px;padding:0px 0.4em" bgcolor="#F7F7F7">master</code>. Honestly, I find it hard to remember whether 3.3 or 3.4 is the current released version!</p></div></div></div></blockquote><div><br></div><div style="font-family:arial,helvetica,sans-serif;font-size:small" class="gmail_default">I think it's easy to tell since the numbers are increasing, so if there's v3.3 and v3.4, then v3.4 is the current released version. If you're working on v3.4, then I would expect things to be on main until you're ready and then a v3.4 branch is made. This keeps getting updated until it's release at which point a tag could be added to indicate the release.</div><div style="font-family:arial,helvetica,sans-serif;font-size:small" class="gmail_default"><br></div><div style="font-family:arial,helvetica,sans-serif;font-size:small" class="gmail_default">But all of this requires work. And since I'm not the one doing the work, I defer to you for the final decision.<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div><div style="font-family:sans-serif"><div style="white-space:normal">
<p dir="auto">I'm curious -- how many of the people who want <code style="background-color:rgb(247,247,247);border-radius:3px;margin:0px;padding:0px 0.4em" bgcolor="#F7F7F7">v3.3</code> instead of <code style="background-color:rgb(247,247,247);border-radius:3px;margin:0px;padding:0px 0.4em" bgcolor="#F7F7F7">stable</code> expect that they would actually interact with this branch, checking it out and supplying merge requests, versus just thinking it's better in some ideal fashion?</p></div></div></div></blockquote><div><span class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small">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 various releases for testing.)</span> </div></div><br clear="all"><br>-- <br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div></div>Ray<br></div></div></div>