Re: [Development] Rebasing

2018-01-26 Thread Thiago Macieira
On sexta-feira, 26 de janeiro de 2018 07:17:24 PST Konstantin Tokarev wrote: > 26.01.2018, 18:14, "Igor Mironchik" : > > Hi, > > > > What if you have a patch based on 5.11 branch and you want to rebase it > > to 5.9, how do you do such work? Do you use regular git rebase? Or maybe > > you just do

Re: [Development] Rebasing

2018-01-26 Thread Liang Qi
https://wiki.qt.io/Branch_Guidelines search "cherry-pick" BTW, you always can ask in #qt-labs channel at freenode, see https://wiki.qt.io/Online_Communities . Perhaps will get reply much faster without sending emails in mailing list. --Liang On 26 January 2018 at 16:14, Igor Mironchik wrote:

Re: [Development] Rebasing

2018-01-26 Thread Konstantin Tokarev
26.01.2018, 18:14, "Igor Mironchik" : > Hi, > > What if you have a patch based on 5.11 branch and you want to rebase it > to 5.9, how do you do such work? Do you use regular git rebase? Or maybe > you just do a new branch based on 5.9, do changes, commit and changes > Change-Id to the existing an

[Development] Rebasing

2018-01-26 Thread Igor Mironchik
Hi, What if you have a patch based on 5.11 branch and you want to rebase it to 5.9, how do you do such work? Do you use regular git rebase? Or maybe you just do a new branch based on 5.9, do changes, commit and changes Change-Id to the existing and do push? Thank you. __

Re: [Development] Rebasing a contribution

2011-11-25 Thread João Abecasis
Oswald Buddenhagen wrote: >> That's why I am asking that, if people are going to submit rebases, >> submit ONLY the rebase, with no extra changes. >> > well, that's noble, but it just won't happen in most cases. been there, > tried it, didn't even get a t-shirt. How about this, you decide to reba

Re: [Development] Rebasing a contribution

2011-11-24 Thread Oswald Buddenhagen
On Thu, Nov 24, 2011 at 12:21:55AM +0100, ext Thiago Macieira wrote: > On Wednesday, 23 de November de 2011 21:33:14 Oswald Buddenhagen wrote: > > On Wed, Nov 23, 2011 at 07:07:17PM +0100, ext Thiago Macieira wrote: > > > So, if I have reviewed your patch #6 in the contribution and you > > > need t

Re: [Development] Rebasing a contribution

2011-11-23 Thread Thiago Macieira
On Wednesday, 23 de November de 2011 21:33:14 Oswald Buddenhagen wrote: > On Wed, Nov 23, 2011 at 07:07:17PM +0100, ext Thiago Macieira wrote: > > So, if I have reviewed your patch #6 in the contribution and you need to > > rebase in order to modify something, then rebase, push #7, leave a comment

Re: [Development] Rebasing a contribution

2011-11-23 Thread Oswald Buddenhagen
On Wed, Nov 23, 2011 at 07:07:17PM +0100, ext Thiago Macieira wrote: > So, if I have reviewed your patch #6 in the contribution and you need to > rebase in order to modify something, then rebase, push #7, leave a comment > saying it was a rebase, modify and submit #8. That way, I can compare #7 t

[Development] Rebasing a contribution

2011-11-23 Thread Thiago Macieira
Hello Here's a recommendation for submitting rebased changes to Gerrit, coming from someone who likes to compare different versions of a submission. When you rebase, submit the rebase *only*. Do not change anything in your contribution. Then add a comment saying you rebased, so that a reviewer wi