[Swan-dev] Missing routes with KLIPS in 3.30

Antony Antony antony at phenome.org
Fri Feb 28 15:48:34 UTC 2020


On Wed, Feb 26, 2020 at 11:00:30AM -0500, Paul Wouters wrote:
> On Wed, 26 Feb 2020, Antony Antony wrote:
> 
> > > I still do not prefer changing the way versioning works. We have never
> > > done this before.
> > 
> > why not?
> 
> Because we have never done this before. Everyone using libreswan has to
> figure out what this new digit means. They might expect that we are
> keeping a LTS version of 3.30.x around, which we do not have resources
> to maintain. 

thanks for sharing your reasoning. I do not quite follow your speculations 
of expectioans.  I guess lets keep doing what we do, may be until you 
change.

> > I think this a good time to start doing 3.30.X style branches and tags. If
> > we do not master will jump from 3.30 to 3.32, missing 3.31 tag.
> 
> The idea was to do a merge, even if it is with no real changes just to
> get the tag in. 

careful with that tag merge idea. At merge everything may appear good to 
you.  Merge would be an empty merge, if you do it right. My experience is 
later in the repo, git diff v3.31 wil look different than git diff 
release-v3.31

compare "git diff v3.31" just before the merge
and at the merge, and one commit after the merge.  

After the merge of the tag "git diff v3.31" will be empty, and commits which 
are both in master and release-3.31 would appear double, that would 
confusing. And later on when "git checkout v3.31" most cases you will get 
v3.31 merged point in master and not the release-3.31 tag v3.31. In some 
cases you would the real v3.31. Graphs and reference points are amazing:)

> > As far as I recollect last two times such a jump happened, think of 
> > v3.23
> > and v3.29, no one was happy and requested 3.30.x style release.
> 
> I don't think people requested this style before. The idea we had the
> first time was to do release branches and leave them "dead", while
> master continued. When we did that, THEN people complained the tag
> was not on master and that confused some tooling.

my recollection is we (all) talked at many water fountain chats and I 
imagined there was consensus. Clearly I was a misunderstood your position.  
And now it is clear.

-antony


More information about the Swan-dev mailing list