Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [ptp-dev] ptp_7_0 branch created

I think the wiki page is still accurate.
It refers to ptp_6_0 (juno) and master but it's similar.  I'd replace with ptp_7_0 (kepler) and master is then luna.
http://wiki.eclipse.org/PTP/environment_setup_70

Note It recommends putting both branches in each of two clones, per previous discussion here.
This is merely for convenience.
Yesterday I pushed a small change to ptp_7_0, then switched to master and did the merge, it worked fine but it was
slow waiting for the switch each time - i need to make another clone and use another workspace which will speed things up - i will do this eventually.

So i will probably keep my existing clone which i call 'org.eclipse.ptp-kepler' - and i will probably leave it on ptp_7_0 branch by default,
and make a new clone, org.eclipse.ptp-luna, which will have master as its default, but also include ptp_7_0, if only to be able to conveniently compare branches.
These are the branches you pull into your local git clones - you can always pull in more later with Team > new branch (see instructions on that wiki page
under Updating / New Branches




...Beth

Beth Tibbitts
Eclipse Parallel Tools Platform  http://eclipse.org/ptp
IBM STG - High Performance Computing Tools
Mailing Address:  IBM Corp., 745 West New Circle Road, Lexington, KY 40511

Inactive hide details for Christopher Navarro ---06/20/2013 11:46:14 AM---I still have some questions about getting things setuChristopher Navarro ---06/20/2013 11:46:14 AM---I still have some questions about getting things setup right for  checking in fixes to a branch and

From: Christopher Navarro <cmnavarr@xxxxxxxxxxxx>
To: <ptp-dev@xxxxxxxxxxx>
Date: 06/20/2013 11:46 AM
Subject: Re: [ptp-dev] ptp_7_0 branch created
Sent by: ptp-dev-bounces@xxxxxxxxxxx




I still have some questions about getting things setup right for checking in fixes to a branch and then merging them to master:

1) Is there a way inside Eclipse to checkout both ptp_7_0 and master as "Local"? The only way I can seem to find is to switch to command line and do a git checkout -b branch-name origin/branch-name.
2) I've setup a separate git repo to play with where I created a master and branch, I checked in and pushed a change to the branch. Then I switched back to master so I can merge the fix in, but I am not sure what selections to make in the Merge dialog so that I merge the fix back into master. There are 3 areas in the merge dialog to make selections: a tree showing the local, remote tracking and tags, a section on merge options and a section on Fast forward options. I'm not sure what to select. I've attached a screenshot of the merge dialog.

Thanks,
Chris

On 06/18/2013 03:34 PM, Greg Watson wrote:
    With two workspaces you can fire up two copies of Eclipse so you don't need to continually switch between them. Switching between branches (or workspaces) triggers a full rebuild for me, plus all the API tooling seems to get run. It takes forever, at least for me.

    Greg

    On Jun 17, 2013, at 2:32 PM, Roland Schulz <roland@xxxxxxx> wrote:
      Hi,

      I have used  so far always just one workspace and one git repository. What is the advantage of having two workspaces?

      Roland

      On Mon, Jun 17, 2013 at 1:57 PM, Christopher Navarro <cmnavarr@xxxxxxxxxxxx> wrote:
        Let me see if I understand correctly using ptp_7_0 and master as the example. Are you suggesting that I create two workspaces, one for working with master as the initial branch and one for working with ptp_7_0 as the initial branch, but that each workspaces clone would contain both ptp_7_0 and master? I would basically have:

        Workspace 1 with
        Local -> master
        Remote Tracking -> master, ptp_7_0

        Workspace 2 with:

        Local -> ptp_7_0
        Remote Tracking -> master, ptp_7_0

        Does that look correct?

        Thanks,
        Chris


        On 06/17/2013 11:30 AM, Beth Tibbitts wrote:

          >it suggests two clones, one for master work and one for ptp_7_0 work. Is that really necessary since I can put both into a single clone?
          That's because even if you have two workspaces, say for master and ptp_whatever, they both point to the same 'active' branch so it would be a bit confusing.
          That's what I do - make two different clones, they both have both branches (or more, for convenience say for comparing branches) as it eases my own sanity.
          You could put both in a single clone, yes.

          I find git confusing enough :) and this helps me keep things straight.
          Others are of course welcome to use it otherwise!


          ...Beth

          Beth Tibbitts
          Eclipse Parallel Tools Platform            http://eclipse.org/ptp
          IBM STG - High Performance Computing Tools
          Mailing Address:  IBM Corp., 745 West New Circle Road, Lexington, KY 40511

          Christopher Navarro ---06/17/2013 11:58:29 AM---I have a question about this process so I'd appreciate a little guidance  since I am still a fairly
    From: 

Christopher Navarro <cmnavarr@xxxxxxxxxxxx>
    To: 

<ptp-dev@xxxxxxxxxxx>
    Date: 

06/17/2013 11:58 AM
    Subject: 

Re: [ptp-dev] ptp_7_0 branch created
    Sent by: 

ptp-dev-bounces@xxxxxxxxxxx




    I have a question about this process so I'd appreciate a little guidance since I am still a fairly novice user of Git. When I go through the dev setup on the wiki, I select master and ptp_7_0 and set master as the working branch. Inside of Eclipse I see master under "Local" and under "Remote Tracking" I see master and ptp_7_0. I believe I can just do a checkout on ptp_7_0 so I can get a full copy of ptp_7_0 under Local as well for switching between branches in order to do the steps you outlined below, right?

    The " Checking out PTP projects" section of the wiki is a little confusing to me because although it says I can checkout both master and ptp_7_0 into a single clone, it suggests two clones, one for master work and one for ptp_7_0 work. Is that really necessary since I can put both into a single clone? Is this simply convenient and an easy way to separate out whether you are working on something strictly for master vs fixing a bug in the release?

    On a side note, I wonder if this would make for a good session topic at our dev meeting in September (or even a dev call sharing a screen). If someone feels like they have a good development setup that they'd like to share for working on both master and a previous release branch I would find this useful. We can assume we all understand the Git basics so I'd really just be looking for how you setup your dev environment, where do you put your clones of the repository, how to commit something to ptp_7_0 and then merge it with master. Also the other step mentioned below of where after merging with master reverting it in master.

    Thanks,
    Chris

    On 06/13/2013 01:44 PM, Greg Watson wrote:
      I've created a ptp_7_0 branch. This will be used for future 7.0.x releases, so please remember not to make API changes in this branch. Changes going into master will end up in a future 7.x or 8.0 release.

      Just a reminder that bug fixes that need to go into both branches should be committed to the ptp_7_0 branch, then merged with master. Changes just for ptp_7_0 will need to be committed to ptp_7_0, merged to master, then reverted in master.

      Finally, I'll schedule a 7.0.1 release for 6/24 in order to pick up the sync bug fix that didn't make Kepler.

      Thanks,
      Greg
      _______________________________________________
      ptp-dev mailing list
      ptp-dev@xxxxxxxxxxx
      https://dev.eclipse.org/mailman/listinfo/ptp-dev
    _______________________________________________
    ptp-dev mailing list
    ptp-dev@xxxxxxxxxxx
    https://dev.eclipse.org/mailman/listinfo/ptp-dev




    _______________________________________________
    ptp-dev mailing list
    ptp-dev@xxxxxxxxxxx
    https://dev.eclipse.org/mailman/listinfo/ptp-dev
    [attachment "merge-master.png" deleted by Beth Tibbitts/Watson/IBM] _______________________________________________
    ptp-dev mailing list
    ptp-dev@xxxxxxxxxxx
    https://dev.eclipse.org/mailman/listinfo/ptp-dev

    GIF image

    Back to the top