Hi Nate,

Thanks for the reply! To answer/clarify your points:
>.hgignore should not affect files that you have explicitly tracked (e.g. with `hg add job_conf.xml`)
I have a suspicion that when I tried to add a directory using Eclipse, I might have added the whole repository, taking it all out of .hgignore's control.

>if the file is tracked, Mercurial will attempt to update and patch the working copy if there are upstream changes.
It does seem like it isn't merging or patching, just choosing one over the other...

>it looks like your current tip includes neither .hgignore or job_conf.xml
I did indeed try to remove those files from being tracked in the tip. This caused those files to be removed from my working copy when I updated.

>Your tip is also on the stable branch - do you mean to be working in two branches?
I didn't know what I was doing (still dont!) when I set up the repository - it seemed like if I was pulling from stable automatically, I should do all of my work in stable. I was further confused when Eclipse pushed to default by default and then I ended up mangling both.

What I'm looking for now is a way to merge the last good changeset from my remote server (bf3924e Added pull..) with my last good local repo (6dc34fa Refined cli runner..). Should I just pull 6dc and replace the files I need from bf3 manually?