A comment about mercurial

Just wanted to encourage people to never copy files from one astrobear repository to another. This essentially corrupts the repository since mercurial will assume the changes to the file were intended. It is difficult to debug corrupted repositories since it is no longer clear what modifications to the source code have been made, and a corrupted repository should never be committed since that will potentially (and quietly) undo bug fixes. If there is a repository with modifications that you would like to replicate in another repository, you should commit those changes to the first repository and then pull that changeset to your own repository. This way mercurial knows where the changes came from and can correctly merge those changes with any that you might make down the road.

Copying data files is not as 'bad' as long as the copied data files are never committed. (Just use hg revert *.data before you commit). If you do want to update the data files in the repository, then you should not copy them from another directory, but instead commit the changes in the directory where you first modified them - or revert them and replicate the changes manually.

Also, you can commit individual files so if there is a single bug fix in a single file, just run hg commit somefile.f90 and then pull that change to the other repository and update or merge if necessary.

Comments

No comments.