Sharing source changes

cougaar.org only publicly exports read-only Git source repositories.  The repositories and how to clone them for your local editing are described at Modules in Git Repositories.  Be sure to read the section about Line Terminators. Here we suggest a workflow for making changes in your local copy of a repo and then sharing the changes with us.

Simple workflow

If you only have a private Git repository, with cougaar.org as its only remote repository, then you can use the following workflow:

  1. Clone our public git repository as described in Modules in Git Repositories.
  2. Add your change or fix a bug.
  3. Test it locally.
  4. Do a git pull to verify your repository is up to date with ours.
  5. Commit your change to your local Git repo with git commit.
  6. Generate a patch with git format-patch and save it to a file.
  7. Email the patch to support@cougaar.org.  Ensure that the subject line starts with “[PATCH]“.  git send-email can be used to send the patch.
  8. We will email you back if we accept the patch and have added it to the official repository.
  9. Do a git pull after the notification to merge in the changes.  If we accepted your patch as-is, the merge should be simple.

Multiple upstream workflow

If you want to maintain a shared Git repository for multiple developers on your site, then follow the instructions in the references below for keeping that repository in sync with cougaar.org’s repositories via two remotes, one from the git clone and one from git add remote.

References