Bruce Dubbs wrote these words on 02/01/07 15:45 CST: > svn merge -r X:Y http://svn.linuxfromscratch.org/BLFS/tags/6.2.0-rc1 > > Where X is the rev for the trunk revision and Y is the rev for the > latest tag revision.
Well, the syntax looks close, but my understanding is different. svn merge is almost identical to svn diff. I thought the X:Y is the versions in trunk to diff from. And the last argument should be trunk while issuing the command from the rc1 working dir (after checking it out, of course). I'll look at the redbean book and make sure, but since I looked at this earlier, I'm fairly confident. Just keep in mind about how svn merge is almost identical to svn diff. So essentially, in layman English, my understanding is as follows: svn merge -r TheRevNumberToDiffAgainst:TheOtherRevNumberToDiffAgainst URLforTrunk while issuing the command in the working dir of the checked out rc1 tag. And, in case it's not handy: http://svnbook.red-bean.com/en/1.2/svn-book.html Sorry for the redundancy in this message. ============================================== Now, all that said, it may be simpler to copy the files from trunk to a checked-out rc1 tag manually. I'm not sure how well the general.ent file will merge. It seems it would have conflicts (due to the several version changes between trunk and rc1). I would have committed the KDE changes separate from the changelog and general.ent files. That way, there is no possible conflicts. But there may not be any anyway. -- Randy rmlscsi: [bogomips 1003.26] [GNU ld version 2.16.1] [gcc (GCC) 4.0.3] [GNU C Library stable release version 2.3.6] [Linux 2.6.14.3 i686] 15:50:01 up 22 days, 16:04, 1 user, load average: 0.12, 0.03, 0.18 -- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
