Hi Ross, I tried the rebase path and it seems to work. The rebase duplicates all commits of master to the euphrates branch which can make that branch very busy. It is possible to squash all commits into 1 (which is what I’d like to keep the release branch clean). In any case, the main difference with a merge is that we’re missing the ancestor link from master to the new commit on euphrates (the one that indicates where the merge comes from). I’d have to add a commit description such as “merge from master at hash …). Do you agree? A regular merge would have done this in a more formal and clean way – but requires push merge commit permission in gerrit. If all else is not possible I’ll sync using your method + squashing all commits.
Thanks Alec From: "Brattain, Ross B" <[email protected]> Date: Wednesday, October 18, 2017 at 3:06 PM To: "Alec Hothan (ahothan)" <[email protected]>, "[email protected]" <[email protected]> Subject: RE: [opnfv-tech-discuss] [releng] How to merge master to euphrates with gerrit git remote update # create new branch based on master git checkout -B euphrates-sync-$(date -I) origin/master # rebase on euphrates git rebase origin/stable/euphrates # or to pick patches git rebase -i origin/stable/euphrates # resolve conflicts # submit all patches to gerrit git review stable/euphrates +2 all in Gerrit and Submit including parents. From: [email protected] [mailto:[email protected]] On Behalf Of Alec Hothan (ahothan) Sent: Wednesday, October 18, 2017 1:15 PM To: [email protected] Subject: [opnfv-tech-discuss] [releng] How to merge master to euphrates with gerrit I have many commits in master which I’d like to merge to stable/euphrates. Would like to check if anybody knows how to merge master into a release branch using gerrit? Looks like I may need the permission to upload merges with Gerrit. Here is what I did: $ git fetch origin stable/euphrates:euphrates $ git checkout euphrates $ git merge master –no-ff # at this point, so far so good, I got all my commits into my euphrates branch # git review fails due to permission: $ git review Warning: Permanently added '[gerrit.opnfv.org]:29418,[198.145.29.81]:29418' (RSA) to the list of known hosts. remote: Processing changes: refs: 1, done To ssh://gerrit.opnfv.org:29418/nfvbench.git ! [remote rejected] HEAD -> refs/publish/master/euphrates (you are not allowed to upload merges) error: failed to push some refs to 'ssh://[email protected]:29418/nfvbench.git' Is there a different way to achieve this? I do not want to cherry pick my commits as I have too many of them. Thanks Alec
_______________________________________________ opnfv-tech-discuss mailing list [email protected] https://lists.opnfv.org/mailman/listinfo/opnfv-tech-discuss
