Re: [orion-dev] Re-verify any changes in git since Friday

[Mark Macdonald <mamacdon@xxxxxxxxx>]

Sorry, Gmail ate my image. Here's the picture of what I got after pulling:

On Tue, Jul 24, 2012 at 7:48 PM, Mark Macdonald <mamacdon@xxxxxxxxx> wrote:

I just did a git pull, checked the log, and found this:



The top commit is a merge, which surprised me: I had no unpushed commits, so I expected to be fast-forwarded.
Looking at the parents of the merge, the first parent is something I pushed a few hours ago:

commit dac947baeeec14506254a7f1791ae60b858b07bc
Author: Mark Macdonald <mamacdon@xxxxxxxxxx>
Date:   Tue Jul 24 16:32:46 2012 -0400
    Bump version # to 1.0

The second parent is this, which Susan pushed later:

commit 659c940462600a768db06c21c48a555a093af344
Author: sfranklin <susan_franklin@xxxxxxxxxx>
Date:   Tue Jul 24 17:07:11 2012 -0400
    remove unnecessary slash from "Raw" URL

Her commit is now on top of remotes/origin/master, and mine doesn't appear under remotes/origin/master at all: hers blew mine away.

Normally Orion would've prevented Susan from pushing this until she merged, but apparently it went ahead and pushed anyway. So maybe this is a bug in our git tooling. I'm not sure why eclipse.org is accepting these non-fastforwarded pushes though.

Mark

On Tue, Jul 24, 2012 at 4:47 PM, Susan Franklin McCourt <susan_franklin@xxxxxxxxxx> wrote:

I'm not sure. For example the theming changes are in the build (so they were in master at one point) but aren't in the log for master now....so it seems like there is some stuff that has gone missing in master...

susan

Simon Kaegi ---07/24/2012 12:39:05 PM---Quite possibly is was just my clone. I've blown mine away and re-cloned. |------------>

From: Simon Kaegi <Simon_Kaegi@xxxxxxxxxx>

To: Orion developer discussions <orion-dev@xxxxxxxxxxx>

Cc: Orion developer discussions <orion-dev@xxxxxxxxxxx>, orion-dev-bounces@xxxxxxxxxxx
Date: 07/24/2012 12:39 PM
Subject: Re: [orion-dev] Re-verify any changes in git since Friday
Sent by: orion-dev-bounces@xxxxxxxxxxx

---

Quite possibly is was just my clone. I've blown mine away and re-cloned.

John Arthorne---07/24/2012 12:29:17 PM---I verified on eclipse.org and we do have receive.denynonfastforwards=true set on both orion reposit

From:	John Arthorne/Ottawa/IBM@IBMCA
To:	Orion developer discussions <orion-dev@xxxxxxxxxxx>
Date:	07/24/2012 12:29 PM
Subject:	Re: [orion-dev] Re-verify any changes in git since Friday
Sent by:	orion-dev-bounces@xxxxxxxxxxx

---

I verified on eclipse.org and we do have receive.denynonfastforwards=true set on both orion repositories, so this shouldn't be possible. However I think a git clone on orion.eclipse.org would not have this set automatically. Maybe there were just some individual clones in a bad state?

Simon Kaegi/Ottawa/IBM@IBMCA
Sent by: orion-dev-bounces@xxxxxxxxxxx

07/23/2012 03:04 PM

Please respond to
Orion developer discussions <orion-dev@xxxxxxxxxxx>

To	Orion developer discussions <orion-dev@xxxxxxxxxxx>
cc
Subject	[orion-dev] Re-verify any changes in git since Friday

Hi all,

Please re-verify any changes you've committed to master since Friday.

We're still investigating but It looks like our master tag was moved in a non-FF way and commits between 7/21 and 7/23 are not present (but still there in the tags).
We'll replay the changes but wanted to send a heads up to make sure people verify we've got it right.

-Simon_______________________________________________
orion-dev mailing list
orion-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/orion-dev
_______________________________________________
orion-dev mailing list
orion-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/orion-dev

_______________________________________________
orion-dev mailing list
orion-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/orion-dev

_______________________________________________
orion-dev mailing list
orion-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/orion-dev