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

Re: Advice Needed: Merging Branch back into Trunk

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-04-01 22:04:45 CEST

Ben Collins-Sussman <sussman@collab.net> writes:

> $ svn co http://.../trunk
>
> $ svn merge http://.../branch@X http://.../branch@Y .
>
> $ svn commit
>
> X is the revision in which /branch was first created, and Y is
> typically HEAD.
>
> If you repeat this merge later on, you have to be careful not to
> remerge changes that were applied already.

OK so far.

> You need to compare /branch@(Y+1) with /branch@HEAD.

That's not right, it will miss any @Y to @(Y+1) change. If the first
merge is @X to @Y, the next merge should be @Y to @Z.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Apr 1 22:05:33 2003

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