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

Re: conflicts, history, and the Principle Of Least Surprise

From: Sean Russell <ser_at_germane-software.com>
Date: 2002-02-21 05:52:33 CET

Hash: SHA1

You sent this off-list; I'm taking back to the list because I've got some
input that I hadn't thought of, or seen stated, before.

On Wednesday 20 February 2002 08:46 pm, you wrote:
> Yes, the assumption there was that we're aiming for CVS users (which
> we are). But I can say for sure that I like conflict markers better
> than the current .rej file system, having used both ways extensively.

Yah, me to, to be honest... but I like the flexibility for the .rej files.
You can get the CVS markers from the .rej files, but not vice-versa... not as
easily. The same information is there, I suppose, but it is much easier to
go one way than the other.

In particular, I'm thinking of the future, when we may have an intelligent IDE
that can handle the .rej files. It'll most likely be able to do more with
the .rej files than with the markers embedded in the source.

Furthermore, I'd /guess/ that .rej files are more appropriate for binaries,
since trying to insert markers into binaries is impossible to do
unilaterally. Having Subversion treat text differently than binaries breaks
the conformity of the system. Yes, I realize that text already is treated
differently than binary data, but I guess if I'm used to looking for .rej
files for binaries, I'll only have to learn and remember one way of dealing
with conflicts.

For whatever 0.2 cents is worth these days...

Oh, and I'd like to publically apologize for some really horrid spelling in my
past few postings. They've been pretty painful to read.

- --
 |.. I'll never forget the first time I ran Windows, but I'm trying...
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:09 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.