El Miércoles, 23 de Noviembre de 2005 23:49, Gerard Beekmans escribió: > Apparently that is not correct because that command pulled in another > change from branch's changelog.xml, the entry from Manual about PDF > fixes that were applied on November 18.
You made two changes on 6.1.1 changelog that should be merged to trunk. That commit have assigned the revision numbers 7170 and 7171. Then, you want to apply a patch to trunk with the differencies created by that commints. "svn merge" use almost the same sintaxis than "svn diff". To merge is like to create a patch. -r7169:7171 meant "Show me what has been changed in the repository from the status at r7169 up to r7171". Like you want to apply that diff on another tree, then you must to specify the URL from that tree where you want to import the diff. Thus, in your working copy of LFS-SVN: svn merge -r7169:7171 the_URL_for_6.1.1 -- Manuel Canales Esparcia Usuario de LFS nº2886: http://www.linuxfromscratch.org LFS en castellano: http://www.escomposlinux.org/lfs-es http://www.lfs-es.com TLDP-ES: http://es.tldp.org -- http://linuxfromscratch.org/mailman/listinfo/lfs-book FAQ: http://www.linuxfromscratch.org/lfs/faq.html Unsubscribe: See the above information page
