|
|
Welcome to the Trilinos Developer Home
Welcome to the Trilinos developer home page, your one stop for all the information you need as a Trilinos developer.New Mail List Spam Management How-To
This how-to can be found at the bottom of the Mailman page.
Trilinos Release 8.0 Notes
Checking Out the Release Branch
To check out the release branch use the following command:cvs checkout -r trilinos-release-8-0-branch Trilinos
Merging Back Changes
Changes made to a release branch are not automatically applied to the development (HEAD) branch. To "merge" a change from one branch to another, you can use the -j option. For example, to merge changes made to foo.cpp and bar.cpp on the trilinos-release-8-0-brach branch back to the HEAD branch, go to the directory containing foo.cpp and bar.cpp in a Trilinos HEAD branch sandbox and typecvs -q update -j trilinos-release-8-0-branch foo.cpp bar.cpp
To recursively merge all changes from a particular directory, including the additions of new files in new directories (assuming again that we are merging from the 8.0 branch to the HEAD branch) type
cvs -q update -dPj trilinos-release-8-0-branch
The merge command does not commit changes to the repository. Before committing changes, be sure to resolve any conflicts. It is also important to do a cvs diff and review the changes that will be made when committing. In most cases, it is also a good idea to run some tests before committing as you would for any other commit. Keep in mind that someone else may have changed the same file and that not all changes made on a release branch should necessarily be made to the HEAD branch. (For example, updated version numbers or the removal of capabilities that are under development.)
Contribute to the Trilinos Site
Developers, is there a page, article, link, or 'Quick Link' that you would like to see on the Trilinos or Trilinos Developer site? Send an email to Esteban Guillen at ejguill@sandia.gov describing what it is you would like to see added or changed. If you are able to contribute an article, include the article in any format convenient for you.
|