I suggest to set the submit type to "Merge if necessary" and "Require Change-ID in commit message" to true in order to avoid problems with missing change-id and to avoid races between commits for different projects: https://git.eclipse.org/r/#/admin/projects/simrel/org.eclipse.simrel.build
Most contributions to simrel just update the version for a certain project and don't touch anything else which could conflict with changes from another project. As long as the option "Automatically resolve conflicts" is set to false if two competing changes touched the same file and one of the changes was submitted Gerrit will reject the submission of the second change with a "Path conflict". -Matthias On Wed, Jun 10, 2015 at 10:11 PM, LETAVERNIER Camille < [email protected]> wrote: > Hi, > > Git works at the entire repository level; not at the file level. So even > if you modify a single file, that nobody else will touch, you can have > rebase/merge issues. > > The simrel repository is configured for "Fast-forward" changes only. So, > if anyone pushes a commit before you, you will have to rebase your commit > and try again. This was not too much trouble until now because everyone > used to push directly to the Git repository, but now, with Gerrit + > Validate, we have to wait 15 minutes for the commit to be validated. That > leaves 15 minutes for a 'conflict' to occur. > > This 15 minutes validation can be skipped (As mentioned, you can Verify +1 > your own commit, or even push to Git directly), but then Gerrit becomes > less useful > > I should have reported a Bugzilla for this (And I probably will, > tomorrow), but I reported this issue a few weeks ago: > https://dev.eclipse.org/mhonarc/lists/cross-project-issues-dev/msg11942.html > > HTH, > Camille > ________________________________________ > De : [email protected] [ > [email protected]] de la part de Jeff Johnston > [[email protected]] > Envoyé : mercredi 10 juin 2015 21:57 > À : Cross project issues > Objet : Re: [cross-project-issues-dev] Gerrit for org.simrel.build keeps > asking me to rebase my change > > I did use the rebase button (twice in fact). My change has nothing to do > with any > other files. I then tried rebasing locally on my system and > resubmitting. That got > me into the mess with two changes out there. I have since added the > change-id, abandoned > the duplicate job, and restarted the build. > > It validated locally. > > -- Jeff J. > > ----- Original Message ----- > > By "release", you mean you press the submit button? > > > > Could it be asking you to "rebase" your commit? (Which, normally can be > done > > with the "rebase" button.? > > > > > > > > > > From: Jeff Johnston <[email protected]> > > To: Cross project issues <[email protected]>, > > Date: 06/10/2015 03:31 PM > > Subject: [cross-project-issues-dev] Gerrit for org.simrel.build keeps > asking > > me to rebase my change > > Sent by: [email protected] > > > > > > > > > > Hello, > > > > I'm trying to get the RC4 change in for Linux Tools. I keep getting a > > successful > > build, then after I review it, it says I have to rebase my change. I do > so, > > it rebuilds > > successfully and then claims I need to rebase it again. I am only > changing > > the > > linuxtools.b3aggrcon file. > > > > Is anyone else experiencing this issue? > > > > -- Jeff J. > > _______________________________________________ > > cross-project-issues-dev mailing list > > [email protected] > > To change your delivery options, retrieve your password, or unsubscribe > from > > this list, visit > > https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev > > > > > > > > _______________________________________________ > > cross-project-issues-dev mailing list > > [email protected] > > To change your delivery options, retrieve your password, or unsubscribe > from > > this list, visit > > https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev > _______________________________________________ > cross-project-issues-dev mailing list > [email protected] > To change your delivery options, retrieve your password, or unsubscribe > from this list, visit > https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev > _______________________________________________ > cross-project-issues-dev mailing list > [email protected] > To change your delivery options, retrieve your password, or unsubscribe > from this list, visit > https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev >
_______________________________________________ cross-project-issues-dev mailing list [email protected] To change your delivery options, retrieve your password, or unsubscribe from this list, visit https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
