Re: [ptp-dev] Git questions

[Chris Recoskie <recoskie@xxxxxxxxxx>]

One thing I would like to mention is that right now, DO NOT use the Team Synchronizing View with Git. Any time I have tried, my local repo has gotten all messed up and/or Egit has gotten somehow out of sync with it. You end up with phantom changes in your repo that just won't go away no matter what you do. When CDT moved to Git, I wasted about a week on this because I kept having to blow away my repos and re-clone them from Eclipse.org so that I could get things back in a good state.

===========================
Chris Recoskie
Team Lead, IBM CDT and RDT
IBM Toronto

Roland Schulz ---11/03/2011 05:57:01 PM---On Thu, Nov 3, 2011 at 5:04 PM, Beth Tibbitts <tibbitts@xxxxxxxxxx> wrote: > My Model from previous

From:	Roland Schulz <roland@xxxxxxx>
To:	Parallel Tools Platform general developers <ptp-dev@xxxxxxxxxxx>
Date:	11/03/2011 05:57 PM
Subject:	Re: [ptp-dev] Git questions
Sent by:	ptp-dev-bounces@xxxxxxxxxxx

---

On Thu, Nov 3, 2011 at 5:04 PM, Beth Tibbitts <tibbitts@xxxxxxxxxx> wrote:

My Model from previously referenced diagram:
  workspace -->index-->local repository --> remote repository
All this is on my local machine except for the remote repo which is at git.eclipse.org

1. I 'commit' to move a file from workspace to local repo.
    So the file decorator ">" in project explorer goes away.
    How do I know what i still need to "push" to finish what I'm used to doing with a CVS commit?

I don't think Egit indicates this. If you not sure whether you already pushed you can always just redo it. Because it doesn't do anything if you already have done. 
On the console "git status" prints "Your branch is ahead of 'origin/ptp_5_0' by 1 commit" if you haven't pushed yet.

    Is there a way to know what pending stuff needs to do up to remote repo?

Right click->Team->Show in History
Click on "Show all changes in repository" (yellow barrel icon)  if you the commit doesn't affect the resources you right clicked
You should see both a commit tagged with HEAD and one with origin/ptp_5_0 (or origin/master). The commits between HEAD and origin/* will be pushed.

2. Then how do you do the 'push' ? on the whole project?  Team -> Push To Upstream?

3. What is customary/easiest way to update everything in the workspace?
    Select all projects and do Team -> Pull?

Both push and pull is always on the whole repository. You cannot push/pull only a single project. So if you have only PTP in your workspace than clicking any resource will push/pull all. If you also of Photran/Doc than you need to select one resource of each to push/pull all.

4. How do i 'synchronize' a container e.g. a project?
    In CVS that showed me how my files differed from what was on the remote repo.
    That showed me what i had changed, what changed on the remote repo, and let me do diffs on selected files.

If you want to compare your workspace with your index than: 
Right click project(s)->Team->Synchronize Workspace

Or 
Right click resource->Compare With (here you have the choice between HEAD/Index/...)

Or in the Git Reposository View
Right click a branch (or remote tracking branch) -> Synchronize Workspace (compares the whole workspace with that branch)

The history view also shows the changed files in each commit.

 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