Georg Baum wrote:
I just wanted to do Abdel a favour
Thanks ;-)
and merged my latest changes to his
branch. I discovered that it already included Peters latest changes, but
e.g. not the latest scons work by Bo.
Actually, your changes and Peter's changes were more than simple merge
because they interact with my current cleanup. Bo's scons work can be
merged "as is" and I usually do a merge every day or so but I was bit
late those days...
That makes working with branches more difficult than it should be, so
please follow this simple rule:
If you merge something to a branch that is intended to follow the trunk,
merge everything up to the desired revision, and not only parts of it.
That would be great indeed.
If you don't know how to do that: One possible way is explained at
http://wiki.lyx.org/devel/pmwiki.php/DevelTips/Branches
I believe that Abdels branch is now in sync with revision 14109 of trunk,
but am not sure.
I think it is yes.
I will change (again) the file naming to please Andre (this is the last
time!) and will be ready to merge then.
Thanks,
Abdel.
