Re: merge all of branch into trunk?

On Sep 8, 2008, at 11:33, Robert P. J. Day wrote:

> i'm sure there's a trivial answer to this, but what is the merge
> incantation to merge all of a branch's revisions since i branched
> into the trunk? it is, of course, easy enough to check the log on
> the branch, get the copy revision, then use that, but is there a
> shorter form that allows me to be unspeakably lazy? thanks.
>
> rday

svn merge --reintegrate? if branch is up-to-date with trunk and you
are using svn 1.5

otherwise ... muhahaha:

svn merge -$(svn log -q --stop-on-copy $BRANCH_URL \
        | tail -n 2 | head -n 1 | egrep -e "^r[1-9][0-9]+" -o):HEAD \
        $BRANCH_URL \
        $PATH_TO_TRUNK_WORKING_COPY

Isn't that horrible? I'll be watching this thread to see if someone
has an actually useful suggestion.

// Ben

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-08 17:15:43 CEST