|
From: Bernhard H. <ha...@ha...> - 2003-11-03 23:38:33
|
Hi,
I finished reformatting the Impact source using jalopy. I applied the
new style to the "HEAD" branch and the "parallel" branch.
To facilitate merging changes from the "HEAD" branch into the
"parallel" branch, I move the tag "Root_parallel" to the actual
revision, where the "parallel" branch really diverges (there were
commits to the "parallel" branch after the tag "Root_parallel" that
already merged changes from the "HEAD" branch to the "parallel"
branch).
Since the revision tagged with "Root_parallel" is now formatted in
another style than "HEAD" and "parallel", changes are still hard to
merge into the "parallel" branch. Therefore, I promoted the
"Root_parallel" tag to a branch and reformatted this version also.
Now the following diff can be applied to the parallel branch to bring
it in synch with the "HEAD" branch:
cvs diff -u -r Root_parallel -r HEAD
The application of this patch only fails in the file "run/Smack.java",
because there have been lots of changes in the "parallel"
branch. Therefore, I did not yet apply this patch. This has to be done
by somebody who is familiar with the changes on the "parallel"
branch. Claus? :-)) Maybe you do that, when the parallel version
reaches some stability.
Best regards, Bernhard Haumacher.
|