Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [ptp-dev] Merge/cherry-pick
Hi

So our policy is to merge, and in the rare case that we have a commit that should
only be for the release branch (ptp_8_0), we should revert the commit on the
master branch after the merge. Is this correct?


John 


On Mon, Jul 7, 2014 at 10:12 PM, Roland Schulz <roland@xxxxxxx> wrote:



On Mon, Jul 7, 2014 at 10:01 PM, Beth Tibbitts <beth@xxxxxxxxxx> wrote:
In https://wiki.eclipse.org/PTP/environment_setup/git#Changes_to_both_ptp_6_0_and_master
I wrote up how to do a merge.  Because if I don't write something on the wiki i don't remember how to do it. :-)

I have never done a cherry pick and nobody has ever defined exactly what it is or how to do it for us.  
 

cherry-pick is usually only used by projects if they have a policy of first testing changes in master and only after it has been tested backport fixes to the release branch. Since we usually apply bugfixes directly to both the release and master branch, we have long been using merge.

Roland
 

...Beth

Beth Tibbitts


On Mon, Jul 7, 2014 at 9:49 PM, Roland Schulz <roland@xxxxxxx> wrote:
I think we used merge for a long time. Both work as long as everyone uses the same. I think merge works better as long as the vast majority of changes in the release branch should also go into the master branch. See: https://dev.eclipse.org/mhonarc/lists/ptp-dev/msg05654.html for the privious discussion. 

Roland


On Sat, Jul 5, 2014 at 2:50 PM, Jeffrey Overbey <jeffreyoverbey@xxxxxxx> wrote:
I committed a small change to Photran's ptp_8_0 branch.  To get it into
the master branch, I'm supposed to cherry-pick it, right?

I remember a lengthy discussion about this a couple of years ago and
don't remember what PTP decided to do.  I thought we were using merge
instead, but the Environment Setup page refers to the Platform Git
workflows, which use cherry picking.

(Sorry, I knew the answer to this a few months ago but forgot...)

Jeff
_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/ptp-dev



--
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
865-241-1537, ORNL PO BOX 2008 MS6309

_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/ptp-dev




--
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
865-241-1537, ORNL PO BOX 2008 MS6309

_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/ptp-dev

Back to the top