Gerard Beekmans wrote:

You know what...one might as well just copy and paste the section of a file you want to merge. That takes infinitely less time than trying to figure out which particular revision numbers to use heh

Personally, I take the advantage of the post-commit messages sent to the mailing list and don't use the bandwidth-consuming "svn log" command. E.g., the subject says (in the livecd repository) "r1154 - trunk/doc" and the commit (removal of stray reference to removed packages) looks valid for other branches. Then, "svn merge -r1153:1154 svn+ssh://[EMAIL PROTECTED]/livecd/trunk" merges things that are mentioned in that mail (but Justin already did that for me in this case).

--
Alexander E. Patrakov
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page

Reply via email to