[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 01:57:59 CEST

> From: Branko Cibej [mailto:brane@xbc.nu]
>
> If the file didn't change, you don't have to record any merge
> history.

I think I disagree. It might be that you performed the merge of the
indicated revisions (of the whole repo), but rejected the changes to a
particular file. The fact that you rejected those changes is
significant. It needs to be remembered just as surely as the cases
where you accept the changes, or the cases where you accept them with
tweaks. To fail to remember any of these decisions produces the same
result: the next time you merge, the file differences are taken to be
uncoordinated changes instead of conscious decisions. At best, the tool
bothers the human about the choice once more; possibly it undoes the
choice.

At least, I think so. But this is the sort of question I'm having
trouble walking through the proposal, for lack of clarity on some of the
basics. Which is why your second response catches my eye:

> You can [record the merge on an unchanged file], of course,
> and it doesn't hurt, but it's not necessary to the proposed algorithm.

So, you're saying that it *is* possible to record a new value of a
property against an unchanged version of a file?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Apr 13 01:58:41 2003

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