El Miércoles, 23 de Noviembre de 2005 22:55, Gerard Beekmans escribió: > Is there an easier way to do this without the hassle of looking up the > revision numbers? Can't it default to the latest version of both versions?
Is very easy. You want now to merge r7170 and r7171 to trunk. First, run "svn info" on your 6.1.1 dir to know the cannonical URL of the repository. Then, change to your LFS-SVN dir and run: svn merge -r7169:7171 the_URL svn diff scn ci -m "Merged r7170 and r7171 from 6.1.1 branch" -- 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
