On Sep 10, 2005, at 4:03 PM, Daniel Vainsencher wrote:

> I think "Load" should be relabeled "Destructively Replace Current  
> Version", in bold red letters, then people will use it less.
>
> At the moment "Load" sounds like something straight forward that is  
> what I want to do, while "Merge" sounds like something complicated  
> that I'll only want to do sometime later.
>
> How about "Smart Load" instead of Merge, and "Replace" instead of  
> "Load"? in stead/in addition, might also be useful to have Load  
> warn someone when loading a version that is not a descendant of  
> their current version (and therefore merge might be smarter).

That's not a bad warning to have.  I think it's much better than (but  
roughly equivalent to) the warning that you currently get when  
committing a version to a repository that has newer versions than  
what you started with (which, at least in my development process,  
happens all the time).  And would probably be enough to prevent the  
problems Stef was having.

Avi