Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[ptp-dev] Switching branches switches other workspaces too

My normal mode of operating is to use a separate workspace for each branch (ptp_5_0 and master)
Now it's even separate eclipse installations (Indigo and Juno, respectively) for each.
They are both using the same local repository, my copy of org.eclipse.ptp  (and photran)

If I switch branches in one workspace
    Project:  Team -> Switch To ->  I can choose between master and ptp_5_0  now.
But whatever I choose, it also switches my other workspace too.

What am I doing wrong, or is there a different model of working in git-land?


...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 Roland Schulz ---11/03/2011 11:30:51 AM---On Thu, Nov 3, 2011 at 11:00 AM, Beth Tibbitts <tibbitts@usRoland Schulz ---11/03/2011 11:30:51 AM---On Thu, Nov 3, 2011 at 11:00 AM, Beth Tibbitts <tibbitts@xxxxxxxxxx> wrote: >  OK a question


    From:

Roland Schulz <roland@xxxxxxx>

    To:

Parallel Tools Platform general developers <ptp-dev@xxxxxxxxxxx>

    Date:

11/03/2011 11:30 AM

    Subject:

Re: [ptp-dev] Working with Git

    Sent by:

ptp-dev-bounces@xxxxxxxxxxx






On Thu, Nov 3, 2011 at 11:00 AM, Beth Tibbitts <tibbitts@xxxxxxxxxx> wrote:
    OK a question

    My initial clone got both master and ptp_5_0 of course. but i was doing it in my ptp_5_0 workspace so i made the default branch 5.0
    (I presume most folks would/should use master as the default branch.)


    Now i used that clone to import into my 6.0 ws.   It gets ptp_5_0 w/o asking what i want.  That was the default, so that's OK.
    Do I then switch to master like this?  
       Team - switch to - Other… and choose Remote Tracking > origin/master ?????

No. One should not use a remote tracking branch for working. It should only be used to viewing code/history.

You should switch by:
- Team->Switch To->New Branch
-  Source ref: refs/remotes/origin/master
- Branch Name: master
- (Make sure that Rebase is selected - it should be if you set autosetuprebase and that checkout is checked)

Roland



 



    ...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




--
ORNL/UT Center for Molecular Biophysics
cmb.ornl.gov
865-241-1537, ORNL PO BOX 2008 MS6309
_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ptp-dev


GIF image

GIF image


Back to the top