Git funnies?

My commits at the end of yesterday afternoon are not showing up.

I had 3 (!) goes at fixing JAL-2500 (exampleFeatures.txt) but after a pull the latest blame annotation on the second line of this file is still sitting at 28th July.

Also I had a sense that JIRA emails had been slowing down.

Is all not well…?

m

The University of Dundee is a registered Scottish Charity, No: SC015096

···

Email signature

University of Dundee shield logo

Mungo Carstairs
Jalview Computational Scientist

The Barton Group
Division of Computational Biology

School of Life Sciences

University of Dundee, Dundee, Scotland, UK

www.jalview.org

www.compbio.dundee.ac.uk
g.m.carstairs@dundee.ac.uk

University of Dundee FacebookUniversity of Dundee TwitterUniversity of Dundee LinkedInUniversity of Dundee YouTubeUniversity of Dundee InstagramUniversity of Dundee Snapchat
We’re Scottish University of the Year again!
The Times / Sunday Times Good University Guide 2016 and 2017

You still have the commits locally ?

···

Email signature

University of Dundee shield logo

Mungo Carstairs
Jalview Computational Scientist

The Barton Group
Division of Computational Biology

School of Life Sciences

University of Dundee, Dundee, Scotland, UK

www.jalview.org

www.compbio.dundee.ac.uk
g.m.carstairs@dundee.ac.uk

University of Dundee FacebookUniversity of Dundee TwitterUniversity of Dundee LinkedInUniversity of Dundee YouTubeUniversity of Dundee InstagramUniversity of Dundee Snapchat
We’re Scottish University of the Year again!
The Times / Sunday Times Good University Guide 2016 and 2017

Not sure what you mean. git status says all up to date.

···

Email signature

University of Dundee shield logo

Mungo Carstairs
Jalview Computational Scientist

The Barton Group
Division of Computational Biology

School of Life Sciences

University of Dundee, Dundee, Scotland, UK

www.jalview.org

www.compbio.dundee.ac.uk
g.m.carstairs@dundee.ac.uk

University of Dundee FacebookUniversity of Dundee TwitterUniversity of Dundee LinkedInUniversity of Dundee YouTubeUniversity of Dundee InstagramUniversity of Dundee Snapchat
We’re Scottish University of the Year again!
The Times / Sunday Times Good University Guide 2016 and 2017


From: jalview-dev-bounces@jalview.org jalview-dev-bounces@jalview.org on behalf of James Procter (Staff) J.Procter@dundee.ac.uk
Sent: 04 August 2017 08:09:53
To: Jalview Development List
Subject: Re: [Jalview-dev] Git funnies?

You still have the commits locally ?

Sent from my Cyanogen phone

On Aug 4, 2017 8:02 AM, “Mungo Carstairs (Staff)” g.m.carstairs@dundee.ac.uk wrote:

My commits at the end of yesterday afternoon are not showing up.

I had 3 (!) goes at fixing JAL-2500 (exampleFeatures.txt) but after a pull the latest blame annotation on the second line of this file is still sitting at 28th July.

Also I had a sense that JIRA emails had been slowing down.

Is all not well…?

m

The University of Dundee is a registered Scottish Charity, No: SC015096

The University of Dundee is a registered Scottish Charity, No: SC015096

The University of Dundee is a registered Scottish Charity, No: SC015096

Email signature

University of Dundee shield logo

Mungo Carstairs
Jalview Computational Scientist

The Barton Group
Division of Computational Biology

School of Life Sciences

University of Dundee, Dundee, Scotland, UK

www.jalview.org

www.compbio.dundee.ac.uk
g.m.carstairs@dundee.ac.uk

University of Dundee FacebookUniversity of Dundee TwitterUniversity of Dundee LinkedInUniversity of Dundee YouTubeUniversity of Dundee InstagramUniversity of Dundee Snapchat
We’re Scottish University of the Year again!
The Times / Sunday Times Good University Guide 2016 and 2017

That means the commits are on the server. Crucible would normally have picked them up easily by now.

Will take a look
Jim.

···

Email signature

University of Dundee shield logo

Mungo Carstairs
Jalview Computational Scientist

The Barton Group
Division of Computational Biology

School of Life Sciences

University of Dundee, Dundee, Scotland, UK

www.jalview.org

www.compbio.dundee.ac.uk
g.m.carstairs@dundee.ac.uk

University of Dundee FacebookUniversity of Dundee TwitterUniversity of Dundee LinkedInUniversity of Dundee YouTubeUniversity of Dundee InstagramUniversity of Dundee Snapchat
We’re Scottish University of the Year again!
The Times / Sunday Times Good University Guide 2016 and 2017


From: jalview-dev-bounces@jalview.org jalview-dev-bounces@jalview.org on behalf of James Procter (Staff) J.Procter@dundee.ac.uk
Sent: 04 August 2017 08:09:53
To: Jalview Development List
Subject: Re: [Jalview-dev] Git funnies?

You still have the commits locally ?

Sent from my Cyanogen phone

On Aug 4, 2017 8:02 AM, “Mungo Carstairs (Staff)” g.m.carstairs@dundee.ac.uk wrote:

My commits at the end of yesterday afternoon are not showing up.

I had 3 (!) goes at fixing JAL-2500 (exampleFeatures.txt) but after a pull the latest blame annotation on the second line of this file is still sitting at 28th July.

Also I had a sense that JIRA emails had been slowing down.

Is all not well…?

m

The University of Dundee is a registered Scottish Charity, No: SC015096

The University of Dundee is a registered Scottish Charity, No: SC015096

Email signature

University of Dundee shield logo

Mungo Carstairs
Jalview Computational Scientist

The Barton Group
Division of Computational Biology

School of Life Sciences

University of Dundee, Dundee, Scotland, UK

www.jalview.org

www.compbio.dundee.ac.uk
g.m.carstairs@dundee.ac.uk

University of Dundee FacebookUniversity of Dundee TwitterUniversity of Dundee LinkedInUniversity of Dundee YouTubeUniversity of Dundee InstagramUniversity of Dundee Snapchat
We’re Scottish University of the Year again!
The Times / Sunday Times Good University Guide 2016 and 2017

The University of Dundee is a registered Scottish Charity, No: SC015096

Fixed.

My commits at the end of yesterday afternoon are not showing up.

I had 3 (!) goes at fixing JAL-2500 (exampleFeatures.txt) but after a pull the latest blame annotation on the second line of this file is still sitting at 28th July.

I did a bad merge (used git -s ours when I really wanted git -X ours) because one of your commits included utils/eclipse/JalviewCodeStyle.xml and I had already updated it in another branch.

I reapplied your patches with a cherry-pick (commits were still in the log, but simply marked as ‘do not apply’). Please check all is OK.

Also I had a sense that JIRA emails had been slowing down.

nope. they’re as slow as normal - but that’s a different system anyhow.

Jim.

···

On 04/08/2017 08:36, James Procter (Staff) wrote: