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

Re: Merging Branches

From: Scott Palmer <scott.palmer_at_2connected.org>
Date: 2004-09-03 18:24:27 CEST

On Sep 3, 2004, at 11:49 AM, Ben Collins-Sussman wrote:

> Yes, there are absolutely plans to add this feature. Come back in a
> year, and see how far we are. We're going to get reserved checkouts
> (locking) done first. "Merge tracking" is a phrase that could apply to
> a dozen different problems, and this is just one of them. It's a
> tremendous task to design and implement.
>
> FWIW, CVS dosen't have merge-tracking either. But we decided it was
> better to release Subversion 1.0 after 4 years (with the advantages it
> *does* have over CVS) rather than wait another 2 years to add
> merge-tracking. :-)
>

Is it really that hard? Isn't this a fairly simple extension of what
is already in place? always remember the version at which the code
branched or was merged. When a merge is done update a "merge-point"
record that says 'changes prior to this point are already merged'.
Subsequent merges would only merge changes from the last "merge-point".
  Is it really 2 years to do that feature? Or am I way over-simplifying
like I usually do :) ?

Scott

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 3 18:24:53 2004

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