Hi all,
I realize that I can't do myself the job of synchronizing the trunk and the 4.0 branch of Dynare. I don't have enough knowledge of some parts of the code to be able to decide whether to merge in the 4.0 the changes made to the trunk.
I now think that the right solution is that the person who fixes a bug in the trunk is responsible for fixing it in the 4.0 branch (provided it also appears there, of course).
Since the release of Dynare 4.0.2 (SVN revision 2224), there have been several changesets which fixed bugs (in the smoother, in OSR, in mult_elimination...). I prefer to leave you the work of merging the relevant ones in the 4.0 branch. The idea is to merge only bug fixes, but not new features or code restructuring (which could create new bugs), so that we can reasonably think that the number of bugs is stricly decreasing in the 4.0.x series.
There are basically two ways of merging a changeset:
- if the 4.0 branch and the trunk code don't differ much in the modified zones, you can use the "svn merge" command. For example, if changeset 3456 contains bugfixes in the trunk that you want to merge, go to "branches/4.0" directory, and type: svn merge -c 3456 http://www.cepremap.cnrs.fr/svn/dynare_v4 This will apply the changeset to your local copy of the 4.0 branch. If everything goes well, you can now commit it. If there is a conflict you need to resolve it by hand. Note that it is possible to give several changesets to the -c option, such as "-c 3456,4567,5678"
- otherwise, if the two codes differ two much, just fix the code "by hand" in the 4.0 branch and commit
In the changelog message, please indicate the number of the changeset that your merged, and a short description of what it did.
Cheers
Sébastien