This could do the trick but I don't quite recommend it. There would be some
commits on master you do NOT want to include in stable branches.
I suggest to pick commits carefully after inspection and do the cherrypick *one
by one *on gerrit. It will keep a record of which patch sets have been
cherry-picked in review history (not just git log).
If you have too many patch sets to be cherrypicked. Something may have gone
wrong. By the time we created stable branch, it should be considered as a
*stable* branch and not expecting too many changes, except for bug fix and
document amending.
My 2 cents.
On Thu, Oct 19, 2017 at 6:04 AM Trevor Bramwell <
tbramw...@linuxfoundation.org> wrote:
> Hey Alec,
>
> Here's a quick way to cherry-pick these all over to the stable/euphrates
> branch. Though you'll still need to submit them all through Gerrit:
>
> git checkout euphrates
> git cherry -v stable/euphrates master | cut -d' ' -f2 | xargs -I{} git
> cherry-pick -x '{}'
>
> 'git review' will ask you to confirm you want to upload multiple
> patchsets. A 'yes' should put all of them up for review.
>
> Regards,
> Trevor Bramwell
>
> On Wed, Oct 18, 2017 at 08:14:59PM +0000, Alec Hothan (ahothan) wrote:
> > 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://
> ahot...@gerrit.opnfv.org: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
> > opnfv-tech-discuss@lists.opnfv.org
> > https://lists.opnfv.org/mailman/listinfo/opnfv-tech-discuss
>
> _______________________________________________
> opnfv-tech-discuss mailing list
> opnfv-tech-discuss@lists.opnfv.org
> https://lists.opnfv.org/mailman/listinfo/opnfv-tech-discuss
>
--
Yujun Zhang
_______________________________________________
opnfv-tech-discuss mailing list
opnfv-tech-discuss@lists.opnfv.org
https://lists.opnfv.org/mailman/listinfo/opnfv-tech-discuss
