Georg Baum wrote:
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.
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 follow a different procedure: From time to time, I check whether any
changes have been made to the trunk. Then I apply
svn merge -r<previousSync>:HEAD
svn+ssh://[EMAIL PROTECTED]/lyx/lyx-devel/trunk
to my personal branch.
I see that this may be dangerous if not applied carefully and
systematically. When copying the branch back to trunk, we must
double-check the changes, unless we want to take the risk to loose some
patches.
Abdel, what is your approach? We really have to make sure that our
branch experiment does not end in a massacre!
Michael
