Am Donnerstag, 2. März 2006 21:12 schrieb Angus Leeming:
> 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
>     svn commit
>     cd ../14x
>     patch -p0 < ../head/head.diff
>     svn commit
> 
> (which is what I've just done with the windows installer stuff)
> 
> Or is it some subversion magic?

I did:

svn merge -r 13285:13286  svn+ssh://[EMAIL PROTECTED]/lyx/lyx-devel/trunk
svn commit

I do not know the advantages over the diff method (that I have used until 
now), because I did not yet merge that often with svn.


Georg

Reply via email to