Mailing List Archive

Re: [lucene-site] branch master created (now 038f44716)
Hi Andi,

you pushed the "master" branch to lucene-site Git repo, which was
outdated and was no longer existing on server. I deleted it because main
AND master cause issues with website build and makes it hard to
understand what needs to be changed for website updates. Please push
your changes to "main" branch! The problem with duplicate branches is
that your push removed some stuff from the website.

Your last push was yesterday and that caused havoc: it removed our
latest releases from web page because you were overwriting it with an
old version.

Please cleanup your local repo and use "main" branch instead. I don't
know what changes are now lost by deleting the branch on server. Please
add your release of python lucene again on correct branch.

Uwe

Am 28.04.2022 um 02:02 schrieb vajda@apache.org:
> This is an automated email from the ASF dual-hosted git repository.
>
> vajda pushed a change to branch master
> in repository https://gitbox.apache.org/repos/asf/lucene-site.git
>
>
> at 038f44716 release 9.1.0
>
> This branch includes the following new commits:
>
> new 038f44716 release 9.1.0
>
> The 1 revisions listed above as "new" are entirely new to this
> repository and will be described in separate emails. The revisions
> listed as "add" were already present in the repository and have only
> been added to this reference.
>
--
Uwe Schindler
Achterdiek 19, D-28357 Bremen
https://www.thetaphi.de
eMail: uwe@thetaphi.de


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: [lucene-site] branch master created (now 038f44716) [ In reply to ]
Hi Uwe,

On Wed, 9 Nov 2022, Uwe Schindler wrote:

> you pushed the "master" branch to lucene-site Git repo, which was outdated
> and was no longer existing on server. I deleted it because main AND master
> cause issues with website build and makes it hard to understand what needs to
> be changed for website updates. Please push your changes to "main" branch!
> The problem with duplicate branches is that your push removed some stuff from
> the website.
>
> Your last push was yesterday and that caused havoc: it removed our latest
> releases from web page because you were overwriting it with an old version.
>
> Please cleanup your local repo and use "main" branch instead. I don't know
> what changes are now lost by deleting the branch on server. Please add your
> release of python lucene again on correct branch.

My notes said to use the 'master' branch. I can change my notes to use
'main' but I need to be told first (!)

All changes are on the 'production' branch as well, so things need not have
been completely lost ?

My git-fu is limited so I can't reconstruct stuff from git, purely, but I
can make sure the PyLucene stuff is current in the 'main' and 'production'
branches. I've now updated my notes to use 'main'.

Andi..

>
> Uwe
>
> Am 28.04.2022 um 02:02 schrieb vajda@apache.org:
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> vajda pushed a change to branch master
>> in repository https://gitbox.apache.org/repos/asf/lucene-site.git
>>
>>
>> at 038f44716 release 9.1.0
>>
>> This branch includes the following new commits:
>>
>> new 038f44716 release 9.1.0
>>
>> The 1 revisions listed above as "new" are entirely new to this
>> repository and will be described in separate emails. The revisions
>> listed as "add" were already present in the repository and have only
>> been added to this reference.
>>
> --
> Uwe Schindler
> Achterdiek 19, D-28357 Bremen
> https://www.thetaphi.de
> eMail: uwe@thetaphi.de
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: [lucene-site] branch master created (now 038f44716) [ In reply to ]
On Tue, 8 Nov 2022, Andi Vajda wrote:

> Hi Uwe,
>
> On Wed, 9 Nov 2022, Uwe Schindler wrote:
>
>> you pushed the "master" branch to lucene-site Git repo, which was outdated
>> and was no longer existing on server. I deleted it because main AND master
>> cause issues with website build and makes it hard to understand what needs
>> to be changed for website updates. Please push your changes to "main"
>> branch! The problem with duplicate branches is that your push removed some
>> stuff from the website.
>>
>> Your last push was yesterday and that caused havoc: it removed our latest
>> releases from web page because you were overwriting it with an old version.
>>
>> Please cleanup your local repo and use "main" branch instead. I don't know
>> what changes are now lost by deleting the branch on server. Please add your
>> release of python lucene again on correct branch.
>
> My notes said to use the 'master' branch. I can change my notes to use 'main'
> but I need to be told first (!)
>
> All changes are on the 'production' branch as well, so things need not have
> been completely lost ?
>
> My git-fu is limited so I can't reconstruct stuff from git, purely, but I can
> make sure the PyLucene stuff is current in the 'main' and 'production'
> branches. I've now updated my notes to use 'main'.

I did the following in lucene-site.git
- git checkout main
- git pull
- git branch -D master
- git branch
* main
production
I then checked the content/pylucene/pylucene_news, content/pages/pylucene
directories as well as the content/pylucene/doap.rdf file (which I fixed
this morning for a XML tag (my bad)).
All looks fine.
For good measure, I also checked the production branch and it looks fine
too.

Andi..

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: [lucene-site] branch master created (now 038f44716) [ In reply to ]
I was able to merge the missing changes into the main branch from
production. It should be uptodate now. There was some hickup with
asf.yaml, too, but should be ok now. Website was rebuilt.

Please please make sure to NOT push to master branch anymore! Please
switch to main and pull changes before editing. And delete your local
"master" branch, too.

I will check how to setup branch protection to not allow pushing a
master branch.

Uwe

Am 09.11.2022 um 01:42 schrieb Uwe Schindler:
> Hi Andi,
>
> you pushed the "master" branch to lucene-site Git repo, which was
> outdated and was no longer existing on server. I deleted it because
> main AND master cause issues with website build and makes it hard to
> understand what needs to be changed for website updates. Please push
> your changes to "main" branch! The problem with duplicate branches is
> that your push removed some stuff from the website.
>
> Your last push was yesterday and that caused havoc: it removed our
> latest releases from web page because you were overwriting it with an
> old version.
>
> Please cleanup your local repo and use "main" branch instead. I don't
> know what changes are now lost by deleting the branch on server.
> Please add your release of python lucene again on correct branch.
>
> Uwe
>
> Am 28.04.2022 um 02:02 schrieb vajda@apache.org:
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> vajda pushed a change to branch master
>> in repository https://gitbox.apache.org/repos/asf/lucene-site.git
>>
>>
>>        at 038f44716 release 9.1.0
>>
>> This branch includes the following new commits:
>>
>>       new 038f44716 release 9.1.0
>>
>> The 1 revisions listed above as "new" are entirely new to this
>> repository and will be described in separate emails.  The revisions
>> listed as "add" were already present in the repository and have only
>> been added to this reference.
>>
--
Uwe Schindler
Achterdiek 19, D-28357 Bremen
https://www.thetaphi.de
eMail: uwe@thetaphi.de


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: [lucene-site] branch master created (now 038f44716) [ In reply to ]
On Wed, 9 Nov 2022, Uwe Schindler wrote:

> I was able to merge the missing changes into the main branch from production.
> It should be uptodate now. There was some hickup with asf.yaml, too, but
> should be ok now. Website was rebuilt.

Thank you for fixing this !

> Please please make sure to NOT push to master branch anymore! Please switch
> to main and pull changes before editing. And delete your local "master"
> branch, too.

I did that now, and wouldn't have if someone had told me about the branch
change.

> I will check how to setup branch protection to not allow pushing a master
> branch.

I no longer have a master branch on my system.

Andi..

>
> Uwe
>
> Am 09.11.2022 um 01:42 schrieb Uwe Schindler:
>> Hi Andi,
>>
>> you pushed the "master" branch to lucene-site Git repo, which was outdated
>> and was no longer existing on server. I deleted it because main AND master
>> cause issues with website build and makes it hard to understand what needs
>> to be changed for website updates. Please push your changes to "main"
>> branch! The problem with duplicate branches is that your push removed some
>> stuff from the website.
>>
>> Your last push was yesterday and that caused havoc: it removed our latest
>> releases from web page because you were overwriting it with an old version.
>>
>> Please cleanup your local repo and use "main" branch instead. I don't know
>> what changes are now lost by deleting the branch on server. Please add your
>> release of python lucene again on correct branch.
>>
>> Uwe
>>
>> Am 28.04.2022 um 02:02 schrieb vajda@apache.org:
>>> This is an automated email from the ASF dual-hosted git repository.
>>>
>>> vajda pushed a change to branch master
>>> in repository https://gitbox.apache.org/repos/asf/lucene-site.git
>>>
>>>
>>>        at 038f44716 release 9.1.0
>>>
>>> This branch includes the following new commits:
>>>
>>>       new 038f44716 release 9.1.0
>>>
>>> The 1 revisions listed above as "new" are entirely new to this
>>> repository and will be described in separate emails.  The revisions
>>> listed as "add" were already present in the repository and have only
>>> been added to this reference.
>>>
> --
> Uwe Schindler
> Achterdiek 19, D-28357 Bremen
> https://www.thetaphi.de
> eMail: uwe@thetaphi.de
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>
>
Re: [lucene-site] branch master created (now 038f44716) [ In reply to ]
Hi Andi,

> I did that now, and wouldn't have if someone had told me about the
> branch change.

Normally before you push the branch and edit anything, you should do a
"git pull" to get latest changes from server. A "git pull" fails with
error message if the branch does not exist on server. So normally you
would notice the issue. It is exactly like with Subversion, if you
update a branch there that no longer exists, you get a 404. The only
difference (and that's the pain) on Git: if you push a non-existing
branch, it is created on server automatically.

We changed from master to main long ago, I think at latest when we
splitted Lucene/Solr. Sorry for not informing you.

>> I will check how to setup branch protection to not allow pushing a
>> master branch.
>
> I no longer have a master branch on my system.

Great!

No problem, it seems all well again,

Uwe

> Andi..
>
>>
>> Uwe
>>
>> Am 09.11.2022 um 01:42 schrieb Uwe Schindler:
>>> Hi Andi,
>>>
>>> you pushed the "master" branch to lucene-site Git repo, which was
>>> outdated and was no longer existing on server. I deleted it because
>>> main AND master cause issues with website build and makes it hard to
>>> understand what needs to be changed for website updates. Please push
>>> your changes to "main" branch! The problem with duplicate branches
>>> is that your push removed some stuff from the website.
>>>
>>> Your last push was yesterday and that caused havoc: it removed our
>>> latest releases from web page because you were overwriting it with
>>> an old version.
>>>
>>> Please cleanup your local repo and use "main" branch instead. I
>>> don't know what changes are now lost by deleting the branch on
>>> server. Please add your release of python lucene again on correct
>>> branch.
>>>
>>> Uwe
>>>
>>> Am 28.04.2022 um 02:02 schrieb vajda@apache.org:
>>>> This is an automated email from the ASF dual-hosted git repository.
>>>>
>>>> vajda pushed a change to branch master
>>>> in repository https://gitbox.apache.org/repos/asf/lucene-site.git
>>>>
>>>>
>>>>        at 038f44716 release 9.1.0
>>>>
>>>> This branch includes the following new commits:
>>>>
>>>>       new 038f44716 release 9.1.0
>>>>
>>>> The 1 revisions listed above as "new" are entirely new to this
>>>> repository and will be described in separate emails.  The revisions
>>>> listed as "add" were already present in the repository and have only
>>>> been added to this reference.
>>>>
>> --
>> Uwe Schindler
>> Achterdiek 19, D-28357 Bremen
>> https://www.thetaphi.de
>> eMail: uwe@thetaphi.de
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
>> For additional commands, e-mail: dev-help@lucene.apache.org
>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org

--
Uwe Schindler
Achterdiek 19, D-28357 Bremen
https://www.thetaphi.de
eMail: uwe@thetaphi.de


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: [lucene-site] branch master created (now 038f44716) [ In reply to ]
> On Nov 9, 2022, at 01:52, Uwe Schindler <uwe@thetaphi.de> wrote:
>
> ?Hi Andi,
>
>> I did that now, and wouldn't have if someone had told me about the branch change.
>
> Normally before you push the branch and edit anything, you should do a "git pull" to get latest changes from server. A "git pull" fails with error message if the branch does not exist on server. So normally you would notice the issue. It is exactly like with Subversion, if you update a branch there that no longer exists, you get a 404. The only difference (and that's the pain) on Git: if you push a non-existing branch, it is created on server automatically.
>
> We changed from master to main long ago, I think at latest when we splitted Lucene/Solr. Sorry for not informing you.

Well, I made a release against 'master' in April of this year and nothing broke then.

>>> I will check how to setup branch protection to not allow pushing a master branch.
>>
>> I no longer have a master branch on my system.
>
> Great!
>
> No problem, it seems all well again,

Good, thank you for catching and fixing this and sorry for the noise.

Andi..

>
> Uwe
>
>> Andi..
>>
>>>
>>> Uwe
>>>
>>> Am 09.11.2022 um 01:42 schrieb Uwe Schindler:
>>>> Hi Andi,
>>>>
>>>> you pushed the "master" branch to lucene-site Git repo, which was outdated and was no longer existing on server. I deleted it because main AND master cause issues with website build and makes it hard to understand what needs to be changed for website updates. Please push your changes to "main" branch! The problem with duplicate branches is that your push removed some stuff from the website.
>>>>
>>>> Your last push was yesterday and that caused havoc: it removed our latest releases from web page because you were overwriting it with an old version.
>>>>
>>>> Please cleanup your local repo and use "main" branch instead. I don't know what changes are now lost by deleting the branch on server. Please add your release of python lucene again on correct branch.
>>>>
>>>> Uwe
>>>>
>>>>> Am 28.04.2022 um 02:02 schrieb vajda@apache.org:
>>>>>> This is an automated email from the ASF dual-hosted git repository.
>>>>>>
>>>>>> vajda pushed a change to branch master
>>>>>> in repository https://gitbox.apache.org/repos/asf/lucene-site.git
>>>>>>
>>>>>>
>>>>>> at 038f44716 release 9.1.0
>>>>>>
>>>>>> This branch includes the following new commits:
>>>>>>
>>>>>> new 038f44716 release 9.1.0
>>>>>>
>>>>>> The 1 revisions listed above as "new" are entirely new to this
>>>>>> repository and will be described in separate emails. The revisions
>>>>>> listed as "add" were already present in the repository and have only
>>>>>> been added to this reference.
>>>>>>
>>> --
>>> Uwe Schindler
>>> Achterdiek 19, D-28357 Bremen
>>> https://www.thetaphi.de
>>> eMail: uwe@thetaphi.de
>>>
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
>>> For additional commands, e-mail: dev-help@lucene.apache.org
>>>
>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
>> For additional commands, e-mail: dev-help@lucene.apache.org
>
> --
> Uwe Schindler
> Achterdiek 19, D-28357 Bremen
> https://www.thetaphi.de
> eMail: uwe@thetaphi.de
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org