I've only been using svn @ $work and never really got into it, so thanks for the extensive explanation. I've read all the thread in detail, and followed the links provided. Many interesting ideas here! Hopefully, I'm learning something.
Regarding the specific issue being discussed here, since versioning control systems keep track of what's getting modified anyway, it seems strange that there's not a "selective" cp command that will copy one branch over another without overwriting files that have been modified in the destination one. If there were, then the OP would issue it before running the tests, resolve problems, and then merge.
Posts are HTML formatted. Put <p> </p> tags around your paragraphs. Put <code> </code> tags around your code and data!
Read Where should I post X? if you're not absolutely sure you're posting in the right place.
Please read these before you post! —
Posts may use any of the Perl Monks Approved HTML tags:
Outside of code tags, you may need to use entities for some characters:
- a, abbr, b, big, blockquote, br, caption, center, col, colgroup, dd, del, div, dl, dt, em, font, h1, h2, h3, h4, h5, h6, hr, i, ins, li, ol, p, pre, readmore, small, span, spoiler, strike, strong, sub, sup, table, tbody, td, tfoot, th, thead, tr, tt, u, ul, wbr
Link using PerlMonks shortcuts! What shortcuts can I use for linking?
See Writeup Formatting Tips and other pages linked from there for more info.
| & || & |
| < || < |
| > || > |
| [ || [ |
| ] || ] ||