Gerard Beekmans wrote these words on 11/23/05 17:06 CST: > Let me clarify something which is maybe causing my own confusion. > > I made a change to changelog.xml in the branch which now has revision > 7171. I don't want to merge all that contents into trunk becaue it > contains other entries I don't care about. I only care about what I just > added, so I guess only the differences between 7170 and 7171 (assuming > 7170 was the previous version of changelog.xml which I don't know?it's > not always one number lower the way SVN works, or is it?)
I'll jump in with a different perspective to see if I can't help out. Keep in mind that the revision numbers are for the whole repo, *not just for an individual branch*. Revision numbers could be like this: 1001 commit to trunk 1002 commit to 6.1.1 1003 commit to clfs 1004 commit to clfs 1005 commit to clfs 1006 commit to 6.1.1 1007 commit to clfs Now, if you wanted to merge the changes made in revision 1006 to 1001, note it is not sequential. I think you're missing this important point. -- Randy rmlscsi: [GNU ld version 2.15.94.0.2 20041220] [gcc (GCC) 3.4.3] [GNU C Library stable release version 2.3.4] [Linux 2.6.10 i686] 17:10:01 up 60 days, 2:34, 3 users, load average: 1.08, 0.90, 0.50 -- http://linuxfromscratch.org/mailman/listinfo/lfs-book FAQ: http://www.linuxfromscratch.org/lfs/faq.html Unsubscribe: See the above information page
