Re: hg problems

[<don...@is...>]

Elliott Slaughter writes:

 > > >   hg pull -u
 > > > says: ...
 > > >   abort: crosses branches (merge branches or use --check to force update)

 > I got this error once by having uncommitted changes while
 > updating. I had to revert my changes before Mercurial would stop
 > complaining. Just something to check.

I got the same result on two different machines, and I think
I had an uncommitted change on ONE of them.

On the one without (I think) changes:
 $ hg up tip
 8 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg pull -u
 pulling from http://clisp.hg.sourceforge.net:8000/hgroot/clisp/clisp
 searching for changes
 no changes found

On the one WITH a change (and old hg - version 0.9):
 $ hg up tip 
 this update spans a branch affecting the following files: 
  doc/faq.xml 
  modules/clx/new-clx/clx.f 
  modules/clx/new-clx/clx.lisp 
  modules/clx/new-clx/test.tst 
  src/ChangeLog 
  src/NEWS 
  src/spvw_language.d 
  win32msvc/nsis/env_var_update.nsh (resolve) 
 aborting update spanning branches! 
 (use 'hg merge' to merge across branches or 'hg update -C' to lose
 changes) 

But my change was to src/unixaux.d, not mentioned above.
So I suspect the difference is due to hg version.
I continue with
 $ hg up -C 
 8 files updated, 0 files merged, 0 files removed, 0 files unresolved 
 $ hg pull -u 
 pulling from http://clisp.hg.sourceforge.net:8000/hgroot/clisp/clisp 
 searching for changes 
 adding changesets 
 adding manifests 
 adding file changes 
 added 1 changesets with 1 changes to 785 files 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 

I only hope everything is now in the right state.
Also that I don't have to go through this in the future.