Converting from using CVS to hg

[robert delius royar]

I have 21.5.b28 from CVS which I have kept uptodate.  I also have a few 
changes to files in src and lisp for my own use.

I just got a clone of the current tree using
  mv xemacs xemacs-cvs
  hg clone http://hg.debian.org/hg/xemacs/xemacs
When I want to update the xemacs tree, do I
  cd xemacs
  hg pull http://hg.debian.org/hg/xemacs/xemacs

If I move over my changed files from xemacs-cvs, will hg merge new 
changes instead of replacing the files?  CVS merged the changes.

If I am only compiling and using XEmacs--not contributing code, is hg 
still the way I should go?  I know that the CVS archive is still 
being updated at some points.

-- 
Dr. Robert Delius Royar                   Associate Professor of English
Morehead State University                             Morehead, Kentucky