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

Re: doing Perforce-style "pure" integrations

From: John P Cavanaugh <cavanaug_at_sr.hp.com>
Date: 2000-08-31 07:58:49 CEST

On Tue, Aug 29, 2000 at 06:37:01PM -0500, Karl Fogel wrote:
> Without going into too much detail, I just want to point out that
> Subversion should support the concept of the "pure integration", like
> Perforce:
> http://www.perforce.com/perforce/branch.html
> (search for "pure" in that page)
> For example, if you merge branch B into a locally-unmodified trunk,
> but end up doing some conflict resolution before you commit that
> trunk, you want to be able to tell Subversion that it's still a pure
> merge. Meaning that when you commit, the ancestors added to the new
> version N's ancestor set should be exactly those obtained from the
> merge from B -- the stuff you did for conflict resolution doesn't
> count. That way, if you later have to merge back from the trunk to B,
> the change N will will not be included in the merge, because B knows
> it already has those changes, even though textually they might not be
> exactly what B already has.

Its probably apparent to all, but I thought it might be work
highlighting that this is for *physical* conflicts resulting from a
merge only. Not for logical conflicts (ie. semantic changes etc) that
popped up after the merge.

> Note that it's not an automatic thing -- Subversion can't decide for
> the user whether or not to mark a commit as being from a pure merge;
> some merges are and some aren't. The user has to consciously flag it
> as pure.

You cant automate detection if a merge is truly pure, but you should
be able to detect when it clearly isnt pure, right?? Is it worth
having to code to detect false positives??

    John Cavanaugh Agilent Technologies
    R&D Program Manager 1400 Fountaingrove Pkwy
    CAD Data Store Santa Rosa, CA 95403-1799

    Email: cavanaug@soco.agilent.com Phone: 707-577-4780
                                                707-577-3948 (Fax)
      As I grow older, I pay less attention to what men say. I
     just watch what they do.
                                           -- Andrew Carnegie
Received on Sat Oct 21 14:36:07 2006

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.