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.

use Perl

All the Perl that's Practical to Extract and Report

merging both ways in subversion More | Login | Reply

The Fine Print: The following comments are owned by whoever posted them. We are not responsible for them in any way.

Without JavaScript enabled, you might want to use the classic discussion system instead. If you login, you can remember this preference.

Use "svnmerge" (Score:1)

by nik (3476)

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]
- Re: (Score:1)
  
  by runrig (3385)
  
  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
  - Re:Use "svnmerge" (Score:1)
    
    by rjbs (4671) on 2006.10.27 23:19 (#51332) Homepage Journal
    
    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
    
    Reply to This
    
    Parent

Get More Comments

Stories, comments, journals, and other submissions on use Perl; are Copyright 1998-2006, their respective owners.