Hi Ben,
> But I'm not sure whether I have write access to the git repository, or
> the preferred means for changing the repo. I thought instructions might
> be on the wiki, but it appears that's toast at the moment (possibly
> related to the recent website downtime).
The web page is currently running on the AMBER server at SDSC. However, I
don't have a complete copy of the website so this is why some things like
the wiki etc don't work at present. I'll switch the DNS records back once I
hear from Rutgers the web server there is fixed. Last update today was that
the tech that came out could not fix things...
I can give you write access to the git tree if you promise to be careful...
A synopsis of the procedure is:
git clone gitosis.git.ambermd.org:amber.git
cd amber
git branch foo
git checkout foo
<Do some modifications - use 'git add [filename]' to stage files for being
committed>
git commit <commit your changes to your local branch as needed>
<occasionally resync with the master>
git checkout master
git pull
git checkout foo
git merge master
<do some more modifications, commits etc - When you are ready to upload to
the main tree do>
git checkout master
git pull
git checkout foo
git merge master <check everything is good at this stage>
git checkout master
git merge foo <Merge your branch into the local master>
<check all is good>
git push <Pushes your updates to the main server>
<To incorporate into amber11 do>
git log <Locate checksums for your commits>
git checkout amber11
git cherrypick <checksum> - <This will incorporate your changes into the
AMBER 11 branch - hopefully the merge will work>
<When you are done with this you can do>
git push <This pushes your updates to the master amber11 branch>
<You also need to make the bugfix patches. This can technically be done with
git patch / git diff but for time being I would do this step manually.
Good luck,
Ross
/\
\/
|\oss Walker
| Assistant Research Professor |
| San Diego Supercomputer Center |
| Tel: +1 858 822 0854 | EMail:- ross.rosswalker.co.uk |
|
http://www.rosswalker.co.uk |
http://www.wmd-lab.org/ |
Note: Electronic Mail is not secure, has no guarantee of delivery, may not
be read every day, and should not be used for urgent or sensitive issues.
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Thu Jul 08 2010 - 15:30:03 PDT
