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

Re: Repeated merge strategies

From: Nuutti Kotivuori <naked_at_iki.fi>
Date: 2002-12-22 14:57:05 CET

Zack Weinberg wrote:
> The GCC team has documented this procedure and uses it for all
> branch development. I suspect we're going to see 1.0 Subversion
> as a step backward in this regard if 'svn merge' can't do this at
> all, even with the equivalent kludges (cp-ing every merge point
> into the tags directory). I don't know if 'svn merge' has the
> equivalent of cvs update -jTAG1 -jTAG2.

As already pointed out, 'svn merge' has the equivalent of 'cvs update
-jTAG1 -jTAG2'. But also, tracking these things is even easier. There
is no need to make a tag for each merge point, only to note the
revision at which it was made. This can be stored in the repository,
in log messages or externally, whatever. The only thing people will
need to know is that "What is the last revision that has already been
merged?" to perform the merge.

-- Naked

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Dec 22 14:57:48 2002

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