In the past I have used the following procedure (given by Alfredo) to merge changes from HEAD to a branch. They assume that the current working directory is a check out copy of BooktabBranch:
1) cvs rtag -F -r HEAD BooktabNewBase lyx-devel 2) cvs update -j BooktabBase -j BooktabNewBase 3) cvs rtag -F -r BooktabNewBase BooktabBase lyx-devel 4) cvs commit What is the best practice to do it in svn? I think that the following should work (ROOT stands for svn+ssh://svn.lyx.org/lyx/lyx-devel): 1) get current revision of trunk, eg by svn log ROOT/trunk --limit 1 2) svn merge ROOT/tags/BooktabBase ROOT/[EMAIL PROTECTED] . 2) svn merge ROOT/tags/BooktabBase ROOT/[EMAIL PROTECTED] ROOT/tags/BooktabBase 3) svn commit REV is the revision obtained in step 1) (just to be sure that no intermediate changes done by somebody else get merged) The tag BooktabNewBase is not needed anymore. Is this correct? Are there better methods? Georg
