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

Re: merge tracking use cases

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-12-01 01:02:08 CET

On Fri, 30 Nov 2007, Mark Phippard wrote:

> On Nov 30, 2007 5:59 PM, David Glasser <glasser@davidglasser.net> wrote:
> > So, we have this merge tracking use cases/requirements doc:
> >
> > http://subversion.tigris.org/merge-tracking/requirements.html
> >
> > Which of these does current trunk (or "current trunk plus easy changes
> > that we know how to do") support?

Ignoring some bugs in what we do have, what we don't support fully
includes:

- Merging
  - The parts of Repeated Merge dealing with reflected/cyclic merging
    (issues #2897 and #2837)
  - Block/Unblock Changeset
  - Parts of "Handle Renames" (some of which cmpilato has in progress)
  - Properties

- Miscellaneous
  - Authorization (I'm not sure about this one)

> > Note that I don't see anything there that reminds me of #2897, (Am I
> > missing something?)
>
> I was updating Jack Repenning on all of this to get his take. He said
> that #2897 is the most common use case. It is what everyone that uses
> ClearCase UCM does (in fact it is officially called the "Standard Use
> Model") and if Subversion does not have that feature then it does not
> have merge tracking.
>
> I cannot really disagree. I raised this back in June and I've raised
> it several times since then. It is hard to argue that we have
> advanced the bar if a user cannot merge a branch back to trunk.

Issue #2897 is a core part of the Repeated Merge use case. Issue
#2837 is coupled (almost the same), but the plan was to defer that
part for post-1.5.

  • application/pgp-signature attachment: stored
Received on Sat Dec 1 01:02:27 2007

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