This is my fault - basically the branch to develop the 3D features
has not been kept up-to-date with smaller changes made to the trunk
and also none-3D changes have been added to the Jpowder3D branch, which
should have been added to the trunk first and then merged into the the
Jpowder3D branch... So we have a little bit of a mess here.
To resolve this I suggest:
1) Manually (i.e. not through svn commands) copy all none-3D changes from
Jpowder3D to trunk/code/JpowderViewer and commit these changes.
Jpowder3D was created at commit 323.
2) Create new branch: branch/Jpowder_3D that is a copy of
trunk/code/JpowderViewer
3) Manually (i.e. not through svn commands) copy all 3D changes from Jpowder3D
to Jpowder_3D.
As long as the Jpowder 3D features are not in a mature state of being presented
to test
users it is VERY IMPORTANT that all none-3D feature changes are committed to
the trunk
NOT to Jpowder_3D. Such commits may subsequently be merged from the trunk to
Jpowder_3D (using svn merge command).
When Jpowder_3D eventually has matured it will then be straigthforward to merge
the 3D stuff into the trunk, and,
more importantly, while Jpowder_3D is developed, other features can be
committed
to the trunk without messing things up even more.
It will be a pain to do this issue, but it will be even more pain if it
is not done
Original issue reported on code.google.com by anders.m...@stfc.ac.uk on 28 Oct 2011 at 1:09
Original issue reported on code.google.com by
anders.m...@stfc.ac.uk
on 28 Oct 2011 at 1:09