Am Donnerstag, 15. Juni 2006 10:22 schrieb Michael Gerz: > 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.
Yes, that works as well. As I wrote, the procedure described on the wiki is only one possibility. > I see that this may be dangerous if not applied carefully and > systematically. That is the same with the other procedure. The key is the <previousSync> revision. You can't do anything wrong with both methods if that one is right. With your method you need to remember it somewhere, with the one described on the wiki you can get it from svn. > When copying the branch back to trunk, we must > double-check the changes, unless we want to take the risk to loose some > patches. Indeed. Georg
