[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merging insanity

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-09-02 00:23:00 CEST

On Sep 1, 2005, at 5:11 PM, Ximon Eighteen wrote:

>>> do you think this is a lot of work?
>>>
>>>
>> Yes, it's too much work, and it hinges upon fallible human decisions.
>> Is there really no simple equivalent to `cvs update -j MY_BRANCH' in
>> Subversion?
>>
>
> You're not the only one, I've heard one of my fellow developers fuming
> about this difference between CVS and SVN. I think, for now at least,
> he's worked around it by writing wrapper scripts.

Is all the fuss about trying to find the revision which is the 'base'
of the branch? The whole running 'svn log --stop-on-copy' to figure
out when the branch was created?

Why not, when creating the branch, also make a tag of it:

    $ svn cp trunkURL branchURL
    $ svn cp branchURL branch-beginning-tag-URL

    [...make changes on branch...]

    $ svn checkout trunkURL; cd trunk
    $ svn merge branch-beginning-tag-URL branchURL

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 2 00:25:09 2005

This is an archived mail posted to the Subversion Users mailing list.