OK, time for me to learn about svn. I supposed I should use "svn
merge", but how?

[EMAIL PROTECTED]:~/lyx-devel/lyx1.4 % svn merge -r14237:14238
svn+ssh://svn.lyx.org/lyx/lyx-devel/trunk
C    src/frontends/controllers/tex_helpers.C
D    lib/scripts/TeXFiles.sh
A    lib/scripts/TeXFiles.py
Skipped missing target: 'lib/scripts/convertDefault.py'
U    lib/Makefile.am

check svn diff, and svn up. Techniquely you can do

svn merge -r14237:14238 svn+ssh://svn.lyx.org/lyx/lyx-devel/trunk
/url/to/1.4.x/branch

but I prefer to be more careful.

The skipped target is all right, since this patch has a side effect of
adding language line of convertDefault.py. (Lars is correct that we
should do one thing in a patch.).

Bo

Reply via email to