[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-dev
Subject:    Re: conflicts, history, and the Principle Of Least Surprise
From:       Vladimir Prus <ghost () cs ! msu ! su>
Date:       2002-02-20 8:51:43
[Download RAW message or body]

Karl Fogel wrote:
> I've just reviewed the recent thread about whether we should put
> conflict markers in files, or continue using .rej files as we have
> been, or do something else entirely.  

>   a) ...
>   b) ...

Agree.

>   c) We should behave as similarly to CVS as possible -- the Principle
>      Of Least Surprise.  This is really important, and was not given
>      enough attention in the previous discussion imho.  There's no
>      point being gratuitously different if we can be an intuitive
>      superset instead.

Your principle makes sense. 

> The proposal is simply:

The reason I was suggesting that .rej file contain merged file with conflict 
markers was the following use case: you make update, suddenly get a number of 
conflicting files, and have to resolve all the conflicts just to make the 
program compile again. With your scheme, it is possible to just make some 
renames, and get the conflicting files in the state they had before. And, as 
the number of sudden conflicts is not likely to be large, it's quite possible 
to perform that renaming by hand. Therefore, I have no objections to your 
proposal. When implemented, it will considerably increase subversion's 
usability -- I'm looking forward to it.

- Volodya

[prev in list] [next in list] [prev in thread] [next in thread]