[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: Raman Gupta <rocketraman_at_fastmail.fm>
Date: 2005-09-02 04:37:07 CEST

Ian Eure wrote:
> On Sep 1, 2005, at 3: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?

CVS requires the same fallible human decisions -- you always need to tag
your branches so that you know where the branch point was, and if you've
already merged from that branch, where the last merge point was.

>> 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.
>>
>> On this topic I think he also defines a variable for the base part of
>> the repository URL that doesn't change between commands so that he
>> doesn't have to retype it every time he needs it.
>
>
> Is there any way you could get me in touch with him, or send me those
> scripts?

Why don't you try out svnmerge, which is a great bourne shell script
that really helps with automating merging. Unfortunately, the main
svnmerge web site is down right now, but you can get the script from the
subversion repository:

http://svn.collab.net/viewcvs/svn/trunk/contrib/client-side/svnmerge?rev=HEAD&view=log

Some information about it here (I think this page has most of the
information that was on the main page):

http://www.sipfoundry.org/tools/svnmerge.html

Also check out the new svnmerge mailing list:

http://www.orcaware.com/mailman/listinfo/svnmerge

If you're interested in bi-directional merging of branches, check out
the August list archives, where there was some very interesting
discussion on this topic (including a working patch, though Archie has
decided that the final implementation of this will work differently).

Cheers,
Raman

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 2 04:39:11 2005

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