Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [ptp-dev] Switching branches switches other workspaces too

Now you could clone one workspace from the other if you are internet bandwidth limited, but then you got to play with the remote definitions to make sure your pushes go to the right place. But this is just easier.

 

From: ptp-dev-bounces@xxxxxxxxxxx [mailto:ptp-dev-bounces@xxxxxxxxxxx] On Behalf Of Greg Watson
Sent: Friday, November 04, 2011 1:39 PM
To: Parallel Tools Platform general developers
Subject: Re: [ptp-dev] Switching branches switches other workspaces too

 

That's what I'm doing too. Master and ptp_5_0.

 

Greg

 

On Nov 4, 2011, at 11:31 AM, Schaefer, Doug wrote:



It’s a different model. The git working directory is independent of Eclipse. And it’s a physical directory so there’s only one view of it at any given time.

 

For CDT, I have two local repos, one for CDT 8.x and one for master.

 

Doug.

 

From: ptp-dev-bounces@xxxxxxxxxxx [mailto:ptp-dev-bounces@xxxxxxxxxxx] On Behalf Of Beth Tibbitts
Sent: Friday, November 04, 2011 11:25 AM
To: Parallel Tools Platform general developers
Subject: [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

<image001.gif>Roland 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

<image002.png>

From:

<image003.png>
Roland Schulz <roland@xxxxxxx>

<image002.png>

To:

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

<image002.png>

Date:

<image003.png>
11/03/2011 11:30 AM

<image002.png>

Subject:

<image003.png>
Re: [ptp-dev] Working with Git

<image002.png>

Sent by:






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


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

 

Back to the top