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

Re: repeated merges

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-11-25 16:45:47 CET

Timothee Besset <ttimo@idsoftware.com> writes:
> I am adapting a script I wrote to do vendor branches with repeated merges
> in a semi-automated way to svn, so for now I handle the repeated merges
> and revision number housekeeping from my scripts. The problem I've hit is
> on the first merge, where I don't have rev1 to provide in "svn merge
> -rrev1:rev2". I would love to have something that can tell "this branch
> started at rev rev1". Or even give it rev 0 and mean that this means "the
> first time this file appeared".

Well, we don't need to special case rev 0. We could just use a new
revision keyword, "ORIG", analogous to "BASE", "HEAD", etc.

Hmmm, Bill Tutt, is this related to your "[PATCH] Fix for 1003"? That
is, is this a feature that gets easier or more efficient to implement
once your patch is in?

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 25 17:22:14 2002

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.