[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [orion-dev] Ongoing problem with lost commits
|
385895: unnecessary prompting and quiet
"push --force" when pushing from git status
https://bugs.eclipse.org/bugs/show_bug.cgi?id=385895
is fixed now, so you can click "OK" on Git Push Confirmation
dialog safely.
For showing promtps too many times we
already have bugs, see:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=385895
https://bugs.eclipse.org/bugs/show_bug.cgi?id=385895
--
Szymon
From:
Mark Macdonald <mamacdon@xxxxxxxxx>
To:
Orion developer discussions
<orion-dev@xxxxxxxxxxx>
Date:
2012-07-25 22:14
Subject:
Re: [orion-dev]
Ongoing problem with lost commits
Sent by:
orion-dev-bounces@xxxxxxxxxxx
Yesterday I switched back to master, pulled, and committed/pushed
from git status. I did get a prompt that I had not seen before. No idea
if it's related to this problem, but just in case it's part of the puzzle:
I did some testing here... The trouble starts when you click "OK"
to that dialog: the resulting push operation behaves like "push --force"
and will clobber the remote if your local branch is not up-to-date. The
remote will lose commits.
The workaround is: click "More", pick the desired remote branch
from the tree, then click OK. Doing it this way will give you the normal
REJECTED_NONFASTFORWARD message and abort if you're not up-to-date.
So everyone, please use the More button (see below) until this is
fixed.
You'll have to check the Operations panel to see if the push was rejected
(the error is not reported on the page).
Mark
On Wed, Jul 25, 2012 at 12:49 PM, Susan Franklin McCourt
<susan_franklin@xxxxxxxxxx>
wrote:
My commit yesterday that seemed to stomp Mark's was done
at 2:07pm my time, or 5:07 EDT. Hardly an overnight thing....
I had not done a push for at least a couple weeks because I'm doing some
experimental work in a different branch. Yesterday I switched back to master,
pulled, and committed/pushed from git status. I did get a prompt that I
had not seen before. No idea if it's related to this problem, but just
in case it's part of the puzzle:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=385895
susan
John
Arthorne ---07/25/2012 08:28:56 AM---We have an ongoing problem with lost
Git commits in the orion.client repository. As one example, An
From: John Arthorne <John_Arthorne@xxxxxxxxxx>
To: orion-dev@xxxxxxxxxxx
Date: 07/25/2012 08:28 AM
Subject: [orion-dev] Ongoing problem with lost commits
Sent by: orion-dev-bounces@xxxxxxxxxxx
We have an ongoing problem with lost Git commits in the orion.client repository.
As one example, Anton's big commit with the theming work has now been in
master three times. Anton committed it on Monday and then it was deleted.
I recovered the commit and pushed it again yesterday. Overnight it was
gone again and Gosia pushed it to master a third time. Current working
theories:
1) We could have a bug where push does not fail when you are not caught
up to the remote master, causing you to overwrite remote master with your
contents. I can believe a recent bug in Orion or JGit could cause this,
but we have flags on the git server that should make this impossible.
2) Maybe some process on the foundation side is smacking our entire repository
overnight with an older version. The lost commits I observed seemed to
happen "overnight" (which could also mean Susan or Szymon/Gosia
who work during our evening/night). If you have examples to disprove this
idea let me know.
Paul Webster and I have turned on some additional tracing on git.eclipse.org
that will give us more details if it happens again. Please ping on this
list if you see anything suspicious happen. Meanwhile, please make sure
you fetch/rebase immediately before pushing any change to make sure you
are not overwriting anything.
John_______________________________________________
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
