[Coco] nitros9 level3

[Lothan]

From: Gene Heskett

> Aaron:  I have installed mercurial, and configured my bashrc's to include
> the /etc/bash_completion.d/mercurial file.
>
> But the hgrc files installed are empty of any active content, and from
> reading the man pages I don't have a clue what to put in them.  Are there
> any examples extant that can be shared?

I've never looked at the hgrc file on Linux, but it's probably similar to 
the one in Windows. If it's like the one in Windows, it has a list of 
options that are different from the defaults along with a path to your 
default editor, diff tool, and so forth. I'll update my Ubuntu VM and let 
you know what's in mine later today if someone doesn't beat me to it.

> Once that has been solved, what would a command line to pull the repo with
> hg look like?

There are a couple of ways to go about it. If you want to clone the NitrOS-9 
repository into the current folder, you can use this one:

hg clone http://nitros9.hg.sourceforge.net:8000/hgroot/nitros9/nitros9

When I say current folder, I mean something like ~/src/nitros9 or 
/usr/src/nitros9 where nitros9 is the current folder.

Alternatively, you can specify the relative or full path to the folder you 
want to use and hg will create it if it doesn't exist:

hg clone http://nitros9.hg.sourceforge.net:8000/hgroot/nitros9/nitros9 
~/src/nitros9

> And one to just pull any updates without destroying any local work since
> the last pull?

cd into the root of your local repository (e.g. cd ~/src/nitros9) and then 
pull and update:

hg pull
hg update

or you can pull --update (or pull -u) to do both at once:

hg pull --update

If you want to browse the options and command, you can run "hg help" or "hg 
help command", like this

hg help
hg help pull
hg help update

One thing to keep in mind is that when you clone a Mercurial repository, you 
clone the whole thing -- it's basically an exact copy of the original 
repository at that point in time. When you do an hg pull and hg update (or 
hg pull --update), it grabs only the latest commits from the host that you 
don't have just as you would expect.

I mention this because you can make changes to any files in your local copy 
of the repository and when you commit the changes (hg commit), the changes 
are committed only to your local repository. If you have write permission to 
the master repository on SourceForge, you'll need to "hg push" your changes 
to the master at some point (usually when whatever you are working on is 
complete and ready for the public).

To your specific question: When you pull/update from the master to your 
local repository, Mercurial does not clobber any changes in your local 
repository. If you make a change to say OS9Defs and Boisy makes a change to 
OS9Defs in the master, Mercurial will attempt to merge Boisy's change to 
OS9Defs into your copy. Just keep in mind that this ain't CVS or 
SourceUnsafe or Subversion or any of the others that don't have a clue how 
to merge changes correctly. The first time I tried to merge changes with 
Subversion, I ended up with a horribly broken working copy, spent hours 
merging files manually, and swore off merging indefinitely. Mercurial merges 
actually work, although you do need to be aware that it happens somewhat 
silently for the most part. The one time merge doesn't work is when there 
are conflicts; e.g. you change a line to DD.BtSiz and someone else changes 
it to DD.BTSiz. In that case, Mercurial complains about the conflict and 
leaves it to you to resolve. I haven't run into merge conflicts yet, so I'm 
not sure how this works on Linux.

You can commit changes to your local repository in one of two ways:

hg commit

On Windows, this pops up an editor in which you can type the commit message. 
I assume it works the same way on Linux, but I haven't tried it yet. The 
alternative is to enter the commit message on the command line:

hg commit -m "Some explanatory text about the change"