[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [ptp-dev] GIT Test Repo
|
On Fri, Oct 28, 2011 at 4:20 PM, Greg Watson
<g.watson@xxxxxxxxxxxx> wrote:
Question. If I have a clone of the ptp repo, I can import this into two different workspaces, right? But the files are note stored in my workspace, they remain in the local repo. So if I modify files in one workspace, what happens in the other workspace?
Yes. They are changed in the repo and thus will show up in both workspaces.
Seems
like this is problematic. Does this mean I need to clone a repo for each version I need to work on (currently I have a workspace for each PTP version).
You have a two options:
1) You can clone the repository for each version. If you want to avoid the network transfer of the repo, you can clone from your other local repository (you will want to change the repo config after cloning so that it pushes/pulls directly to the main repo and not to the other local one). If you want to avoid the additional data storage on your HDD you can use the command line GIT (cGit) to do the clone (it uses hard-links and thus takes almost no space but JAVA doesn't support hard-links. The JGit/Egit can use a repository cloned by cGIT).
2) GIT makes it very fast to create branches and switch branches. Thus you might not need more than one workspace, by instead switch between the branches. The only requirement is that you don't have any uncommitted files. You can easily create that situation by creating a temporary branch for the feature you are currently working on (GIT invites you to use branches ALL the time) and committing your current status to that branch. Than you can switch to the other version or some other feature branch. It requires a fast computer though, so that compiling isn't taking too long.
Roland
Greg
On Oct 28, 2011, at 2:58 PM, Roland Schulz wrote:
Hi,
the GIT Test Repositories are available.
To checkout from GIT:
1) Start from a workspace without PTP/Photran
2) Install Egit
3) File->Import->Projects from Git
4) Clone
6) Next->Next
7) Choose the initial branch you want
8) Finish
9) Next->Next->Finish
10) Repeat from Step 3 if you want e.g. PTP+Photran
To switch branches:
Right click on any project->Team->Switch To->Branch-name
This switches the branch for all projects within one repository (i.e. PTP/Photran)
Please let me know if you have any problems or you detect any problems (e.g. missing files) with the repository.
The plan is to make CVS readonly as soon as we are sure the GIT Test Repository is correct and organized as we want it too. Than we will convert the CVS once again to GIT and make the GIT available. For now CVS will continue to work and all changes will
be transferred to the final GIT repository.
Roland
--
ORNL/UT Center for Molecular Biophysics
cmb.ornl.gov865-241-1537, ORNL PO BOX 2008 MS6309
