Is very easy. You want now to merge r7170 and r7171 to trunk. First, run "svn
Why 7170? Did you just pick an arbitrary number? If I read it correctly,
trunk's current changelog version is 7168.
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"
Shouldn't that be 7170 instead of 7169, or do you have to subtract one
version from what you are trying to do?
--
Gerard Beekmans
/* If Linux doesn't have the solution, you have the wrong problem */
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
