Angus Leeming <[EMAIL PROTECTED]> writes:
| Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes:
| > Put it in please.
| > Maintrunk first and then merge the revision to the branch.
|
| Now I know I should go and read the subversion docs, but is this "merge to the
| branch" actually:
|
| cd head
| svn diff > head.diff
don't do this
| svn commit
Record the commit revision number <rev>
<prev> = <rev> - 1
| cd ../14x
| patch -p0 < ../head/head.diff
Don't do this.
svn merge -r <prev>:<rev> svn+ssh://svn.lyx.org/lyx/lyx-devel/trunk .
| svn commit
|
| (which is what I've just done with the windows installer stuff)
|
| Or is it some subversion magic?
Not more than the above.
In reality it won't give much more than what diff + patch does, but in
the (near) future subversion will get real merge tracking. Then it
gets really important.
--
Lgb
