[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: Timothee Besset <ttimo_at_idsoftware.com>
Date: 2002-11-24 15:19:39 CET

On 24 Nov 2002 08:12:21 -0600
Ben Collins-Sussman <sussman@collab.net> wrote:

> Timothee Besset <ttimo@idsoftware.com> writes:
>
> > If you don't svn tag your new branch right after creation, you have to svn
> > log it and find out what revision number to use as the start point. Not
> > sure wether or not there should be a command or a revision syntax to point
> > to the 'branch creation' revision.
>
> Yup. That's why we need to solve the "repeated merge" problem
> someday. Humans shouldn't have to remember the exact revision in
> which a branch was created, or remember exactly which revisions have
> been merged from one branch to another. Someday Subversion will
> automate that knowledge for you, probably by tracking the info in
> properties.
>

Yep, I know repeated merges are planned post 1.0

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".

TTimo

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Nov 24 15:20:28 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.