Vanished files

[Johannes Stezenbach]

On Tue, May 02, 2006, radu.c at plutohome.com wrote:
> I'm using Mercurial to keep a clone of the V4L repository and I added some
> custom files to it that don't make any sense being merged back into the
> main repository. I did a "hg pull" yesterday to update its contents and
> those files are gone, but the log shows only my commits to my local clone:

"hg pull" alone shouldn't change your working directory, maybe
you did a "hg update", too?

Anyway, probably you now have multiple heads in your repository
(check with "hg heads"), and the pulled revision in the working
dir, and you need to merge your changes with the pulled changes
("hg merge" or "hg update -m").

HTH,
Johannes