El Miércoles, 23 de Noviembre de 2005 23:08, Gerard Beekmans escribió: > > 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.
Revision numbers are global into the SVN tree, not directory of file specifics. When you do a commit the revision number assigned can be used on any part of the reposiry to refer to that commit. > > 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? "svn merge" works like "svn diff" To see the changes made by r7170 youn need to compare 7169:7170 Last, two know the last revision at what a file was last changed, run svn info pat_to/file You will see two revision numbers: the current repository revision, and the one for the last change in the file. -- 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
