dbaron@pickering Linux (0) /tmp $ mkdir repo1 dbaron@pickering Linux (0) /tmp $ cd repo1/ dbaron@pickering Linux (0) /tmp/repo1 $ hg init dbaron@pickering Linux (0) /tmp/repo1 $ echo hello > foo dbaron@pickering Linux (0) /tmp/repo1 $ hg add foo dbaron@pickering Linux (0) /tmp/repo1 $ hg ci -m"Add foo." dbaron@pickering Linux (0) /tmp/repo1 $ echo goodbye > bar dbaron@pickering Linux (0) /tmp/repo1 $ hg add bar dbaron@pickering Linux (0) /tmp/repo1 $ hg ci -m"Add bar." dbaron@pickering Linux (0) /tmp/repo1 $ hg log changeset: 1:c37477efe41b tag: tip user: L. David Baron date: Fri Jun 06 15:35:46 2008 -0700 summary: Add bar. changeset: 0:a612c26dba4a user: L. David Baron date: Fri Jun 06 15:35:30 2008 -0700 summary: Add foo. dbaron@pickering Linux (0) /tmp/repo1 $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved dbaron@pickering Linux (0) /tmp/repo1 $ echo goodbye >> foo dbaron@pickering Linux (0) /tmp/repo1 $ hg ci -m"Modify foo." created new head dbaron@pickering Linux (0) /tmp/repo1 $ 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/repo1 $ hg ci -m"Merge." dbaron@pickering Linux (0) /tmp/repo1 $ hg log changeset: 3:6912927a470e tag: tip parent: 2:4e95380b7287 parent: 1:c37477efe41b user: L. David Baron date: Fri Jun 06 15:36:17 2008 -0700 summary: Merge. changeset: 2:4e95380b7287 parent: 0:a612c26dba4a user: L. David Baron date: Fri Jun 06 15:36:10 2008 -0700 summary: Modify foo. changeset: 1:c37477efe41b user: L. David Baron date: Fri Jun 06 15:35:46 2008 -0700 summary: Add bar. changeset: 0:a612c26dba4a user: L. David Baron date: Fri Jun 06 15:35:30 2008 -0700 summary: Add foo. dbaron@pickering Linux (0) /tmp/repo1 $ hg log --removed changeset: 2:4e95380b7287 parent: 0:a612c26dba4a user: L. David Baron date: Fri Jun 06 15:36:10 2008 -0700 summary: Modify foo. changeset: 1:c37477efe41b user: L. David Baron date: Fri Jun 06 15:35:46 2008 -0700 summary: Add bar. changeset: 0:a612c26dba4a user: L. David Baron date: Fri Jun 06 15:35:30 2008 -0700 summary: Add foo. dbaron@pickering Linux (0) /tmp/repo1 $