dbaron@pickering Linux (0) /tmp $ mkdir central-repo
dbaron@pickering Linux (0) /tmp $ cd central-repo/
dbaron@pickering Linux (0) /tmp/central-repo $ hg init
dbaron@pickering Linux (0) /tmp/central-repo $ echo hello > foo
dbaron@pickering Linux (0) /tmp/central-repo $ hg add foo
dbaron@pickering Linux (0) /tmp/central-repo $ hg ci -m"Add foo."
dbaron@pickering Linux (0) /tmp/central-repo $ cd ..
dbaron@pickering Linux (0) /tmp $ hg clone central-repo local-repo
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dbaron@pickering Linux (0) /tmp $ cd central-repo/
dbaron@pickering Linux (0) /tmp/central-repo $ echo hello > bar
dbaron@pickering Linux (0) /tmp/central-repo $ hg add bar
dbaron@pickering Linux (0) /tmp/central-repo $ hg ci -m"Add bar."
dbaron@pickering Linux (0) /tmp/central-repo $ cd ../local-repo/
dbaron@pickering Linux (0) /tmp/local-repo $ echo goodbye >> foo
dbaron@pickering Linux (0) /tmp/local-repo $ hg ci -m"Modify foo on branch."
dbaron@pickering Linux (0) /tmp/local-repo $ hg pull
pulling from /tmp/central-repo
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
dbaron@pickering Linux (0) /tmp/local-repo $ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
dbaron@pickering Linux (0) /tmp/local-repo $ hg ci -m"Merge."
dbaron@pickering Linux (0) /tmp/local-repo $ hg push
pushing to /tmp/central-repo
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
dbaron@pickering Linux (0) /tmp/local-repo $ cd ..
dbaron@pickering Linux (0) /tmp $ cd central-repo/
dbaron@pickering Linux (0) /tmp/central-repo $ hg log --follow-first foo
changeset:   0:5bd0715c823e
user:        L. David Baron <dbaron@dbaron.org>
date:        Fri Jun 06 16:23:37 2008 -0700
summary:     Add foo.

dbaron@pickering Linux (0) /tmp/central-repo $ hg log foo
changeset:   2:ca45e0da454b
parent:      0:5bd0715c823e
user:        L. David Baron <dbaron@dbaron.org>
date:        Fri Jun 06 16:24:27 2008 -0700
summary:     Modify foo on branch.

changeset:   0:5bd0715c823e
user:        L. David Baron <dbaron@dbaron.org>
date:        Fri Jun 06 16:23:37 2008 -0700
summary:     Add foo.