Bugzilla – Full Text Bug Listing
| Summary: | Where did the merged commit go | ||
|---|---|---|---|
| Product: | Community | Reporter: | Paul Webster <pwebster> |
| Component: | Gerrit | Assignee: | Eclipse Webmaster <webmaster> |
| Status: | RESOLVED WORKSFORME | QA Contact: | |
| Severity: | normal | ||
| Priority: | P3 | CC: | ahunter.eclipse, denis.roy, john.arthorne |
| Version: | unspecified | ||
| Target Milestone: | --- | ||
| Hardware: | PC | ||
| OS: | Linux | ||
| Whiteboard: | |||
|
Description
Paul Webster
I'm seeing it in stable_20150413 http://git.eclipse.org/c/orion/org.eclipse.orion.client.git/log/?h=stable_20150413 It looked like the commit eb49a9b373aba01b89f1e1af20b862c0a24cb207ESC was force-pushed into the repo. I thought that forced-push was disabled for any of the main branches. commit eb49a9b373aba01b89f1e1af20b862c0a24cb207 Author: Umar Bolatov <ubolatov@ca.ibm.com> AuthorDate: Thu Apr 9 10:37:11 2015 -0400 Commit: Anthony Hunter <anthonyh@ca.ibm.com> CommitDate: Thu Apr 9 10:51:27 2015 -0400 PW (In reply to Denis Roy from comment #1) > I'm seeing it in stable_20150413 > > http://git.eclipse.org/c/orion/org.eclipse.orion.client.git/log/ > ?h=stable_20150413 Yes, it made it stable_20150413, but it should have been in master (and looks like it did make it there, just a forced push wiped it out). 2b7422b master@{0}: merged: fast forward 922e749 master@{1}: push: fast forward eb49a9b master@{2}: push: forced-update f99fb1b master@{3}: merged: fast forward orion-parent allows Force Push, and I'm sure there's a reason why. https://git.eclipse.org/r/#/admin/projects/orion/orion-parent,access I've removed it. (In reply to Denis Roy from comment #4) > orion-parent allows Force Push, and I'm sure there's a reason why. > > https://git.eclipse.org/r/#/admin/projects/orion/orion-parent,access I can't see that page :-) There should be some forced push rules, but only for ${userid}/branchName. Change cannot be merged due to unsatisfiable dependencies.
The following dependency errors were found:
Depends on commit e6ce1fb50d5aa9605bec6182d29822dc829a22de which has no change associated with it.
Depends on commit ead7c6a6e733183e865b28041e2183b9d7ce33e6 which has no change associated with it.
Depends on commit ab566f5032cbbddab94701607b8115aa6c1a0871 which has no change associated with it.
Depends on commit afdca4a4bee3dfb53b04b33b9352277a60d3daf7 which has no change associated with it.
Depends on commit 430a5eace6521520eb3305dc4524d8ff42cc4a64 which has no change associated with it.
Depends on commit d04c7afdccdf940ad1265e26084ce3d00d9bea03 which has no change associated with it.
Depends on commit 7c8234cbf202d55d6c751a0fdac14f50c1f76f93 which has no change associated with it.
Depends on commit 03c8fdfd354f1d235033dc5026a799907b8a9538 which has no change associated with it.
Depends on commit cfbf65c427883f41e393d9af15d4e2722f1e3b3b which has no change associated with it.
Gerrit rejected the merged change https://git.eclipse.org/r/#/c/45594/ with this warning, but then allowed it after a rebase.
Can we move master back to point at this series of commits, effectively reverting the changes in gerrit change 45594?
(In reply to Paul Webster from comment #5) > > I can't see that page :-) > > There should be some forced push rules, but only for ${userid}/branchName. So it looks like our own permissions caused the problem. I would like to double-check the permissions for our repos, and I agree we don't want forced push on any of the main branches. We had some problem where master on eclipse.org was 23 commits behind where it should be, and in fixing that we made my commit disappear from master. PW > So it looks like our own permissions caused the problem. I would like to > double-check the permissions for our repos, and I agree we don't want forced > push on any of the main branches. How do you propose we do this? We were through this just last month in bug 462074: Denis Roy 2015-03-16 13:35:57 EDT Created attachment 251616 [details] Screenshot Paul, this is orion/orion-parent. [reply] [−] Comment 20 Mark Macdonald CLA Friend 2015-03-17 14:03:28 EDT Denis, can you grant Paul, John Arthorne, and myself permission to modify the 'orion-parent' project? We need to set up the ref pattern there, but none of us can access it right now. [reply] [−] Comment 21 Denis Roy CLA Friend 2015-03-17 15:27:14 EDT I've added the eclipse.orion group to the list of owners... that should allow you to do your setup. Let me know when you're done so I can remove it. [reply] [−] Comment 22 Mark Macdonald CLA Friend 2015-03-17 16:29:06 EDT I added refs for refs/heads/${username}/* refs/tags/${username}/* @Paul can you give this a sanity check? I'm not sure what to do with the "refs/*" ref (it's the only remaining difference between orion-parent and platform UI). [reply] [−] Comment 23 Mark Macdonald CLA Friend 2015-03-18 11:10:55 EDT (In reply to Denis Roy from comment #21) > I've added the eclipse.orion group to the list of owners... that should > allow you to do your setup. Let me know when you're done so I can remove it. Thanks Denis. We're done now. [reply] [−] Comment 24 Paul Webster CLA Friend 2015-03-18 11:13:25 EDT (In reply to Mark Macdonald from comment #22) > I added refs for > refs/heads/${username}/* > refs/tags/${username}/* They look good, with the exception of the Push Merge Commit. If we want to have it at all, it should be under refs/for/refs/heads/.... Although I'm fine with not having that enabled, and if we really do need to merge in a feature branch (we rebase our commits for our normal workflow) we would enable it as a one-off. https://review.typo3.org/Documentation/access-control.html#category_push_merge > > @Paul can you give this a sanity check? I'm not sure what to do with the > "refs/*" ref (it's the only remaining difference between orion-parent and > platform UI). That's OK, we don't need to worry about that. PW [reply] [−] Comment 25 Denis Roy CLA Friend 2015-03-18 11:38:53 EDT I've removed the Orion group from the Owners. Is there anything left to do? [reply] [−] Comment 26 Denis Roy CLA Friend 2015-03-23 16:20:48 EDT Fixed it is! Please reopen if you need anything else. I don't know what to do here. |