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

Re: Archiving merge metadata, class project...

From: Jack Repenning <jrepenning_at_collab.net>
Date: 2003-11-20 19:17:18 CET

On Nov 20, 2003, at 9:48 AM, Ben Collins-Sussman wrote:

> But it sounds like you're talking about a system with much higher
> granularity; you actually want to store information about the way
> textual conflicts are resolved within files. Do other SCM systems do
> that? (Big ones, like Clearcase?)

Yah, sure, you betcha!

Not at a finer "granularity," I think, but with more information at
that granularity. Consider the difference between these two cases:

* merged r123,r125 from REL1 branch into REL2 branch, because I haven't
thought about r124 much yet

* merged r123,r125 from REL1 branch into REL2 branch, because REL1:r124
was a really bad idea and I've already fixed that bug in REL2 by a
completely different approach

A subsequent merge of REL1 head to REL2 head (should at least offer the
REL1:r124 change in the first case, but should most definitely exclude
it in the second case. The granularity is still change set, but the
assertions are extended to distinguish "not yet merged" from
"intentionally excluded."

> Anyway, I might recommend starting
> with the 'smaller' problem of simply tracking merged changesets, and
> then if time permits, looking at the more complex problem of tracking
> conflict resolution within files. (The simpler problem is the one I've
> heard users repeatedly clamor for, while I've never heard anyone wish
> for conflict tracking.)

Gosh, I'm sorry I haven't spoken clearly enough ;-)

Jack Repenning
CollabNet, Inc.
8000 Marina Boulevard, Suite 600
Brisbane, California 94005
o: 650.228.2562
c: 408.835-8090

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 20 19:18:22 2003

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.