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

Re: [PROPOSAL] Merging Improved

From: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2003-04-14 18:59:40 CEST

(I wish there were a Subversion dev list archive which showed
message-IDs, so I could do proper replies to mail I've deleted.)

Tom Lord wrote:
>>> Yet, under Sander's proposal (making reasonable assumptions about
>>> how he fleshes out tree-deltas), there is _no_ directory in a
>>> project tree that reliably records the merge history of that
>>> project tree.

I wrote:
>> Wouldn't the root of the project tree qualify, since changes to
>> files bubble up through parent directories to the root? (This of
>> course depends on how tree deltas are fleshed out.)

Tom Lord wrote:
> Well, help me out here. If merge records "bubble up" that way, then
> the merge records for the shallow-depth subdirectories of / in the
> fs namespace will grow to be huge. And if they don't bubble up that
> way, then indeed, there is _no_ directory in a project tree that
> reliably records the merge history of that project tree.

Merge records don't bubble up, but changes do. So any merge done from
the top level of a project will involve changing the root directory of
the project, and therefore adding a merge record to that directory.
Or so I would expect, anyway. (Just like the "file that changes with
every merge" which you suggested as a workaround previously.)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 14 19:00:35 2003

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