> Gesendet: Montag, 28. November 2022 um 06:43 Uhr > Von: "Chris Morley" <chrisinnana...@hotmail.com> > An: "EMC developers" <emc-developers@lists.sourceforge.net> > Betreff: Re: [Emc-developers] Merge Strategy > > Can you explain why merging up is better then cherry-picking or separate > commits?
@Seb explains this better, my short answer would be that it seems easier. > Merge strategy should not change based on what should or should not be moved > forward. > The strategy must be the same. I may misunderstand the word "strategy". The strategy I think is that every bug is fixed at its root. That strategy is the operationalized with the help of the assumption that if that root existed prior to 2.9 then the fix should also be performed on the branch that represents 2.9 and that if the master branch can pull from 2.9 then the fix gets fixed in the current version, too. Now, I know that this is not always possible. The most trivial counter-example coming to my mind is a typo in the name of a pin. If a correction involves that changed pin name (or another part of an API change) then the mere pull is not sufficient to fix the bug. Extra insights are required. Also, a problem may refer to a function that was removed. But this does not interfere with the basic strategy to fix early and pull. Some un-pull-able change should likely then be in another branch like "2.9-release" that branches off from "2.9". The benefit of merging up over a cherry-pick IMHO is that it looks like more robust. But that is more like a gut feeling than me knowing. If the cherry-patches go into 2.9 and the 2.9-only-fruits go into a 2.9-release branch then I think this looks mostly equivalent? Best, Steffen > ________________________________ > From: Steffen Möller <steffen_moel...@gmx.de> > Sent: November 28, 2022 1:04 AM > To: emc-developers@lists.sourceforge.net > <emc-developers@lists.sourceforge.net> > Subject: Re: [Emc-developers] Merge Strategy > > IMHO we should continue with the merge-up and start thinking again when there > is a change to 2.9 that should not be forwarded. > Best, > Steffen > > > Gesendet: Sonntag, 27. November 2022 um 19:11 Uhr > > Von: "Chris Morley" <chrisinnana...@hotmail.com> > > An: "EMC developers" <emc-developers@lists.sourceforge.net> > > Betreff: Re: [Emc-developers] Merge Strategy > > > > Well we will never agree on anything different if we never discuss it. > > How about throwing out an opinion here? > > > > Chris > > ________________________________ > > From: Hans Unzner <hansunz...@gmail.com> > > Sent: November 27, 2022 10:54 AM > > To: emc-developers@lists.sourceforge.net > > <emc-developers@lists.sourceforge.net> > > Subject: Re: [Emc-developers] Merge Strategy > > > > I agree that we should stick to "merge up" until we reach an agreement > > to change this. > > > > Hans > > > > Am 23.11.22 um 22:42 schrieb Chris Morley: > > > Ya it's always been hard to consistently get answers in our project. > > > It just seems the nature of our group. > > > Thanks for continuing to try. > > > > > > Currently strategy is to merge up, though you can cherry-pick up too, as > > > a merge later should understand this. > > > But we rarely do anything with an older-then-current-release (I realize > > > that 2.8 is still sorta current) > > > > > > On the absence of an agreement, I am merging up 2.9 to master to keep in > > > sync. > > > > > > Chris > > > ________________________________ > > > From: andy pugh <bodge...@gmail.com> > > > Sent: November 23, 2022 4:59 PM > > > To: EMC developers <emc-developers@lists.sourceforge.net> > > > Subject: [Emc-developers] Merge Strategy > > > > > > On Tue, 8 Nov 2022 at 21:38, Chris Morley <chrisinnana...@hotmail.com> > > > wrote: > > >> I wonder if we might discuss a different merging strategy for 2 9/master. > > >> This would be relative to work being done in 2.9 for release. > > >> > > >> I suggest we don't merge up any more. > > >> Cherry pick or a separate commit makes more sense to me. > > >> > > > Well, the discussion seems to have resulted in nothing happening, and > > > some things in 2,8 that probably do belong in 2.9 and master. > > > > > > So what _is_ the current policy? > > > > > > > > > -- > > > atp > > > "A motorcycle is a bicycle with a pandemonium attachment and is > > > designed for the especial use of mechanical geniuses, daredevils and > > > lunatics." > > > — George Fitch, Atlanta Constitution Newspaper, 1912 > > > > > > > > > _______________________________________________ > > > Emc-developers mailing list > > > Emc-developers@lists.sourceforge.net > > > https://lists.sourceforge.net/lists/listinfo/emc-developers > > > > > > _______________________________________________ > > > Emc-developers mailing list > > > Emc-developers@lists.sourceforge.net > > > https://lists.sourceforge.net/lists/listinfo/emc-developers > > > > > > > > _______________________________________________ > > Emc-developers mailing list > > Emc-developers@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/emc-developers > > > > _______________________________________________ > > Emc-developers mailing list > > Emc-developers@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/emc-developers > > > > > _______________________________________________ > Emc-developers mailing list > Emc-developers@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/emc-developers > > _______________________________________________ > Emc-developers mailing list > Emc-developers@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/emc-developers > _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
