[Geoserver-devel] Tags and release notes

GeoServer GeoServer Developer
1

I have run into some conflicts trying to sync tags between remote repos:

= [up to date] 2.16.2 → 2.16.2

! [rejected] 2.16.3 → 2.16.3 (would clobber existing tag)

= [up to date] 2.16.4 → 2.16.4

…

= [up to date] 2.20.2 → 2.20.2

! [rejected] 2.20.4 → 2.20.4 (would clobber existing tag)

= [up to date] 2.3-RC1 → 2.3-RC1

I do not know if this is just me? Not sure how they got out of sync?

···

–
Jody Garnett

2

Hi Jody,
how are you getting that?

I’ve tried with a “git fetch -t”, getting no errors:

git fetch -t
remote: Enumerating objects: 2264, done.
remote: Counting objects: 100% (1560/1560), done.
remote: Compressing objects: 100% (478/478), done.
remote: Total 2264 (delta 1070), reused 1504 (delta 1030), pack-reused 704
Ricezione degli oggetti: 100% (2264/2264), 688.85 KiB | 1.94 MiB/s, fatto.
Risoluzione dei delta: 100% (1074/1074), completato con 86 oggetti locali.
Da github.com:geoserver/geoserver
3e7e8c2bcd…0f33e1f6b9 main → geoserver/main
b101163df4…58a6db824b 2.19.x → geoserver/2.19.x
42cfdb1d74…0afcf2a7d3 2.20.x → geoserver/2.20.x
e48d0f9cdc…6dcc807326 2.21.x → geoserver/2.21.x

  • [nuovo riferimento] refs/pull/5873/head → geoserver/pr/5873
  • [nuovo riferimento] refs/pull/5874/head → geoserver/pr/5874
  • [nuovo riferimento] refs/pull/5875/head → geoserver/pr/5875
  • [nuovo riferimento] refs/pull/5876/head → geoserver/pr/5876
  • [nuovo riferimento] refs/pull/5877/head → geoserver/pr/5877
  • [nuovo riferimento] refs/pull/5878/head → geoserver/pr/5878
  • [nuovo riferimento] refs/pull/5879/head → geoserver/pr/5879
  • [nuovo riferimento] refs/pull/5880/head → geoserver/pr/5880
  • [nuovo riferimento] refs/pull/5881/head → geoserver/pr/5881
  • [nuovo riferimento] refs/pull/5882/head → geoserver/pr/5882
  • [nuovo riferimento] refs/pull/5883/head → geoserver/pr/5883
  • [nuovo riferimento] refs/pull/5884/head → geoserver/pr/5884
  • [nuovo riferimento] refs/pull/5885/head → geoserver/pr/5885
  • [nuovo riferimento] refs/pull/5886/head → geoserver/pr/5886
  • [nuovo riferimento] refs/pull/5887/head → geoserver/pr/5887
  • [nuovo riferimento] refs/pull/5888/head → geoserver/pr/5888
    ! [rifiutato] 2.20.2 → 2.20.2 (sovrascriverebbe il tag esistente)
  • [nuovo tag] 2.21-M0.1 → 2.21-M0.1
  • [nuovo tag] 2.21-RC → 2.21-RC
  • [nuovo tag] 2.21.0 → 2.21.0

Cheers
Andrea

···

Regards,

Andrea Aime

==
GeoServer Professional Services from the experts!

Visit http://bit.ly/gs-services-us for more information.

Ing. Andrea Aime
@geowolf
Technical Lead

GeoSolutions Group
phone: +39 0584 962313

fax: +39 0584 1660272

mob: +39 333 8128928

https://www.geosolutionsgroup.com/

http://twitter.com/geosolutions_it

Con riferimento alla normativa sul trattamento dei dati personali (Reg. UE 2016/679 - Regolamento generale sulla protezione dei dati “GDPR”), si precisa che ogni circostanza inerente alla presente email (il suo contenuto, gli eventuali allegati, etc.) è un dato la cui conoscenza è riservata al/i solo/i destinatario/i indicati dallo scrivente. Se il messaggio Le è giunto per errore, è tenuta/o a cancellarlo, ogni altra operazione è illecita. Le sarei comunque grato se potesse darmene notizia.

This email is intended only for the person or entity to which it is addressed and may contain information that is privileged, confidential or otherwise protected from disclosure. We remind that - as provided by European Regulation 2016/679 “GDPR” - copying, dissemination or use of this e-mail or the information herein by anyone other than the intended recipient is prohibited. If you have received this email by mistake, please notify us immediately by telephone or e-mail

3

I honestly do not know how I got that, my theory is:

  • geocat/geoserver syncs with geoserver/geoserver (perhaps including tags)
  • when we re-run builds a revision may be re-tagged by the release process
  • some time in the future if I am unlucky I get a tag conflict

So yeah i suspect this is just me.

···

–
Jody Garnett

4

Okay, Ian unintentionally ran an experiment by re-tagging 2.21.0 to include an additional fix: 135494dccc2c50ba4d0ddcb110a55339081163a1

This gave me the same error since I had the previous 2.21.0 tag locally.

···

–
Jody Garnett

–
Jody Garnett

5

The only “issue” I see is for 2.20.2 when I do git fetch -t

Not sure what’s going on there.

Ian

···

Ian Turton