[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: Jack Repenning <jrepenning_at_collab.net>
Date: 2003-04-13 02:08:43 CEST

> From: Karl Fogel [mailto:kfogel@newton.ch.collab.net]

> To get a feel for this, I tried reasoning about an extreme case:
> you do a merge and absolutely no files are affected. In that
> case, it would be equally correct to store no properties, or to
> store a property on every file indicating that the merge was
> done.

Again, I point out the distinction between two meanings for "no files
were affected":

"there were no differences to merge"
"all the differences were rejected"

The first case is certainly a no-op, and (surely?) everyone would agree
that there's no value in recording anything about it.

The second is a conscious decision (startling, in your extreme case, but
hey, that's what extremities are for!). You can only argue that no
record should be made of this (startling) event if you can also argue
that no subsequent use would be made of the record. And I think that's
not true, here: the next merge including this range of revisions
will/should be affected by this record.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Apr 13 02:09:26 2003

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