Re: [ptp-dev] Git and case insensitive filesystems

[Roland Schulz <roland@xxxxxxx>]

On Mon, Nov 7, 2011 at 9:45 AM, Beth Tibbitts <tibbitts@xxxxxxxxxx> wrote:

OK the wrong file was deleted... i really need the allindex.html [lowercase] file because dozens of html files link to that one.
This is in ptp_5_0 branch.
(Long story: bug in our conversion of OpenMPI man pages to html put the wrong link at the bottom of all the files and it was easier, right before 5.0.2/SR1 release to just change the file name.  Wish I could do that over now.)

I have discussed with Greg this morning and he has reinstated the lowercase file.
Earlier this morning i had the mixed case version(allIndex.html - incorrect one) in my workspace
I did a Team>Pull  from the project and now they are both gone in my Eclipse workspace

Pull does not overwrite changes in the index or workspace and thus if you pull you still don't get the file. You need to reset your file to match the HEAD version.

 

You should be able to get the file by either:

1) Right click on any project -> Team -> Reset. Select ptp_5_0 and Hard. Press OK. This overwrites all your changes. So be careful and don't run this if you have any changes in your workspace (includes ALL projects). You cannot reset individual projects. So you should commit your changes first.

2) Team->Synchronize with Workspace. It opens the Synchronize View. There you can right click the file and click Overwrite. Synchronize with Workspace compares the current branch as it is on the remote server (e.g. refs/remotes/orgin/ptp_5_0) with your workspace.

I heard caveats about doing a synchronize.
How do I look at how my workspace compares to remote repo and what would come down if i did a pull?

If you don't want to use Team->Synchronize (for me it hasn't caused any problems so far) you can also do:

1)

Team->Fetch from Upstream

Team->Show in History

Click "Show all Branches and Tags"

It shows origin/ptp_5_0 and ptp_5_0. The commits between those two will be added to you workspace on pull. The bottom right shows the files for each commit and you can double click them (in compare mode) to see the changes to the files

You can click "Show all changes" if you want all changes in the repository not only those of the selected repository

2)

Team->Compare With->Commit...->origin/ptp_5_0

Compares only selected projects/files. Works well on a few projects but is very slow if you select all. 

But both don't let you restore deleted files so you cannot use it above to restore the allindex.html.

Sorry for the slow reply. We now git pretty well but so far we also don't know egit so well. Some tasks are still easier to do on the command line and knowing the command line tools that what we usually do for those tasks which are tricky with egit.

Roland

If I look on the web interface (http://git.eclipse.org - click on 'tree' at the top to be able to navigate to files)
I can see that indeed the lowercase file seems to be in the repo (which is correct)

I did another pull (says everything is up to date)
but my ws will shows neither of the allindex.html files are there.

If I just look on the file system for the workspace nothing is there. I guess everything is in the git repo now.
If I look on the filesytems under my local git repo, neither file is there either.

Help!


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

Greg Watson ---11/05/2011 11:12:53 AM---It looks like Git can't handle case insensitive filesystems correctly. There were two html files wit

From:	Greg Watson <g.watson@xxxxxxxxxxxx>
To:	Parallel Tools Platform general developers <ptp-dev@xxxxxxxxxxx>
Date:	11/05/2011 11:12 AM
Subject:	[ptp-dev] Git and case insensitive filesystems
Sent by:	ptp-dev-bounces@xxxxxxxxxxx

---

It looks like Git can't handle case insensitive filesystems correctly.

There were two html files with the same name apart from the case (allindex.html and allIndex.html) in the org.eclipse.ptp.pldt.mpi.core plugin in the ptp_5_0 branch. This was causing me grief because git was only able to check one of them out, so it always thought that I'd deleted the second. I ended up removing the lowercase one. I'm not sure if this has broken anything. Please check.

Greg
_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
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