On Fri, Feb 20, 2009 at 03:20:32PM -0500, Mark Phippard wrote:
> On Fri, Feb 20, 2009 at 3:10 PM, Bob Archer <Bob.Archer_at_amsi.com> wrote:
> >> I wrote the text that was quoted, and it is not as absolute as has
> >> been made out. You can still use the branch. The blog you were
> >
> > But you can't reintegrate it, right? Which kind of makes it unuseable.
>
> Sure you can. This works:
>
> $ svn co ^/branch1
> $ svn ci -m "work on branch"
> $ svn merge ^/trunk
> $ svn ci -m "Catch up with trunk"
>
> On trunk WC
> $ svn merge --reintegrate ^/branch1
> $ svn ci -m "Commit all work from branch1"
> Committed revision 100
>
> Back on branch1
> $ svn merge --record-only -r100 ^/trunk
> $ svn ci -m "Mark r100 as merged"
Ah hah! That is the best thing I've read all month. I can simply
do that in a post-commit hook after detecting that a branch has
just been re-integrated. Sweeeet.
(You would not believe the massive Python framework I've had to
write for a client the past few weeks in order to be able to have
an extensible, programmatic context to write hooks in that allow
you to easily identify if a commit is a re-integration of a branch.)
(Although it does other things too.)
Trent.
Received on 2009-02-20 22:14:48 CET