This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: reject merges on gdb release branches?
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: Eli Zaretskii <eliz at gnu dot org>
- Cc: Joel Brobecker <brobecker at adacore dot com>, Will Newton <will dot newton at linaro dot org>, ricard dot wanderlof at axis dot com, GDB <gdb-patches at sourceware dot org>
- Date: Fri, 24 Jan 2014 07:49:08 -0800
- Subject: Re: reject merges on gdb release branches?
- Authentication-results: sourceware.org; auth=none
- References: <20140124080703 dot GL4762 at adacore dot com> <83eh3xep43 dot fsf at gnu dot org> <CANu=DmhEyNvF3au1r+zyrZ2B368iA8PF3hh3cWMM2Hhwa1mpYw at mail dot gmail dot com> <83a9eleksf dot fsf at gnu dot org> <CANu=Dmh39cA462XRa=+254n3CwZ5M3peAQBhN-bhV6A6OuXuzQ at mail dot gmail dot com> <838uu5eju2 dot fsf at gnu dot org> <20140124105807 dot GM4762 at adacore dot com> <837g9peirg dot fsf at gnu dot org> <20140124113014 dot GN4762 at adacore dot com> <8361p9ehht dot fsf at gnu dot org> <20140124115548 dot GO4762 at adacore dot com> <83wqhpcv4z dot fsf at gnu dot org> <CAMe9rOpU3QeMuNveNMYVXJh0xn+WG5eH-LLw7Gw7OLf8qj--Eg at mail dot gmail dot com> <83ob31crka dot fsf at gnu dot org>
On Fri, Jan 24, 2014 at 7:44 AM, Eli Zaretskii <eliz@gnu.org> wrote:
>> Date: Fri, 24 Jan 2014 06:45:11 -0800
>> From: "H.J. Lu" <hjl.tools@gmail.com>
>> Cc: Joel Brobecker <brobecker@adacore.com>, Will Newton <will.newton@linaro.org>,
>> ricard.wanderlof@axis.com, GDB <gdb-patches@sourceware.org>
>>
>> I use both rebase and merge. I use merge on hjl/linux/master
>> branch since I need to go back to checkout previous trees on
>> my branch. Rebase won't work for me here.
>>
>> But for hjl/mpx/pltext8 branch, I use rebase since I
>> plan to commit it to master when the work is complete
>> and I don't need to go back in history.
>>
>> I don't care about the history of each commit on master
>> and release branches. Merge will only confuse me.
>> But you can tag your merged commit before rebase or
>> create a branch for it. All history will be there for you
>> and it won't confuse other people.
>
> There's any number of workflows that git allows. As long as master
> only gets pushes that add commits, I don't see why we should force a
> particular workflow and disallow all others. You should be able to
> use yours, and I should be able to use mine. Sorry, but I refuse to
> believe that people who develop and maintain GDB and Binutils are
> confused by a DAG that has a few merges.
How can you do "git bisect" with merged commits? I
know I can't do git bisect" on hjl/linux/applied branch
since I use merge on it.
--
H.J.