Re: repeated merges

[Timothee Besset <tt...@idsoftware.com>]

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

> Timothee Besset <tt...@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

Re: repeated merges

[Karl Fogel <kf...@newton.ch.collab.net>]

Timothee Besset <tt...@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

Re: repeated merges

[Ben Collins-Sussman <su...@collab.net>]

Timothee Besset <tt...@idsoftware.com> writes:

> What I'm trying to say, is that maybe svn cp should create a property or
> something on the directory when the branch is created? Anything that would
> allow easy retrieval of the point where the branch was created, instead of
> having to read svn log?

Yes, it's generally agreed that this is exactly the first step in
solving the repeated merge problem.  Nobody's bothered to do this yet,
because nobody's exactly sure how they want to design the properties
that hold this data.  (The data will eventually be a lot more complex
than just this first branch-creation step.)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: repeated merges

[Ben Collins-Sussman <su...@collab.net>]

Timothee Besset <tt...@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".

So why not set a custom property on the directory, rather than create
a whole new tag?


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org