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

Re: Merging Branches

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-09-03 16:51:54 CEST

On Fri, 2004-09-03 at 09:47, Jacob Atzen wrote:

> I'm no expert but it seems like your suggestion number 1 is "The Right
> Way"(tm). I assume you've read the books chapter on merging?
> <http://svnbook.red-bean.com/svnbook/ch04s03.html>
> Your number 2 might work if you haven't changed the lines containing
> your trunk to branch merges:
> When patching a file, Subversion typically notices if the file
> already has the change, and does nothing.

Congrats, Russ. You've just discovered why Subversion really needs a
merge-tracking feature. :-)

If Subversion were anything like clearcase, you'd simply say, "hey,
please merge my branch back into trunk", and the system would
automatically know which changes already existed in both branch and
trunk, and skip over them for you.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 3 16:53:42 2004

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