Stories
Slash Boxes
Comments
NOTE: use Perl; is on undef hiatus. You can read content, but you can't post it. More info will be forthcoming forthcomingly.

All the Perl that's Practical to Extract and Report

The Fine Print: The following comments are owned by whoever posted them. We are not responsible for them in any way.
 Full
 Abbreviated
 Hidden
More | Login | Reply
Loading... please wait.
  • Sounds like you need svnmerge, which ships in the Subversion contrib/ directory.

    I wrote a walkthrough showing how to use it that might be useful; http://wikitest.freebsd.org/SVN_Merging [freebsd.org]
    • This sounds cool (and thanks for writing up the example), but I was wondering about another scenario. What happens when you complete your project branch (with occasional merging of trunk to branch), you've merged it to the trunk, and then someone decides that you need to merge this project into an older version branch (say to deliver to a customer on an older version)? Is it easy to cherry pick the revisions that relate to the project, skipping the revisions where you were merging the trunk into the project? Must you decide in advance which directories are mergeable to each other?
      • You'd have to do it by hand, looking for the ranges of revisions between merges from trunk.

        I think it would be tedious and annoying. I think the svnmerge program would help make it less so.
        --
        rjbs