aborting update spanning branches!

[Zbynek Winkler]

Matt Mackall wrote:

>>Thanks, I downloaded the current hourly snapshot and it's working now
>>with -C.  I don't understand why I need -C, though, since I have no
>>changes in my working files.  I'd prefer to not get into the habit of
>>using -C since inevitably I'll eventually wipe out some changes that
>>I'd rather keep.  Why is it necessary in this case?
>>    
>>
>hg update works like cvs update. The normal usage is to sync your
>working directory with tip.
>  
>
$ hg help update
hg update [options] [node]

 -m --merge
   allow merging of conflicts
 -C --clean
   overwrite locally modified files

update or merge working directory

    If there are no outstanding changes in the working directory and
    there is a linear relationship between the current version and the
    requested version, the result is the requested version.

    Otherwise the result is a merge between the contents of the
    current working directory and the requested version. Files that
    changed between either parent are marked as changed for the next
    commit and a commit must be performed before any further updates
    are allowed.

As I understand it, the first paragraph says, that "if there are no 
outstanding changes..." the -C option should not be needed. Do I 
understand it right? I would like that behavior. IMHO the -C should be 
needed only if something is modified (I believe monotone update works 
this way too).

Zbynek

-- 
http://zw.matfyz.cz/     http://robotika.cz/
Faculty of Mathematics and Physics, Charles University, Prague, Czech Republic