This system is the one described by the svn book, except it uses tags in place of unstructured log messages, to avoid needing to paw through the logs to figure out when the last merge was.

Are there useful tools that understand the properties set by svk and svnmerge? What are they? I'd be interested in trying them out.

Switching to svk seems a little extreme as a solution for basic merging. I wouldn't suggest it to someone unless he has a need for doing off-line work or syncing multiple repositories. I could see svnmerge being a good solution in general, but Jim wanted to understand what's going on, and it's a bit hidden with svnmerge. It also doesn't save you much effort in a simple scenario like this one.


In reply to Re^5: [OT] Best Use of Subversion Branches in Perl Development by perrin
in thread [OT] Best Use of Subversion Branches in Perl Development by jkeenan1

Title:
Use:  <p> text here (a paragraph) </p>
and:  <code> code here </code>
to format your post, it's "PerlMonks-approved HTML":



  • Posts are HTML formatted. Put <p> </p> tags around your paragraphs. Put <code> </code> tags around your code and data!
  • Titles consisting of a single word are discouraged, and in most cases are disallowed outright.
  • 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:
    a, abbr, b, big, blockquote, br, caption, center, col, colgroup, dd, del, details, 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, summary, sup, table, tbody, td, tfoot, th, thead, tr, tt, u, ul, wbr
  • You may need to use entities for some characters, as follows. (Exception: Within code tags, you can put the characters literally.)
            For:     Use:
    & &amp;
    < &lt;
    > &gt;
    [ &#91;
    ] &#93;
  • Link using PerlMonks shortcuts! What shortcuts can I use for linking?
  • See Writeup Formatting Tips and other pages linked from there for more info.