Mercurial > hgbook

--- a/en/examples/backout.init.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$ \textbf{hg init myrepo}
-$ \textbf{cd myrepo}
-$ \textbf{echo first change >> myfile}
-$ \textbf{hg add myfile}
-$ \textbf{hg commit -m 'first change'}
-$ \textbf{echo second change >> myfile}
-$ \textbf{hg commit -m 'second change'}
--- a/en/examples/backout.manual.backout.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$ \textbf{echo third change >> myfile}
-$ \textbf{hg commit -m 'third change'}
-$ \textbf{hg backout -m 'back out second change' 1}
-reverting myfile
-created new head
-changeset  backs out changeset
-the backout changeset is a new head - do not forget to merge
-(use "backout --merge" if you want to auto-merge)
--- a/en/examples/backout.manual.cat.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{cat myfile}
-first change
-second change
-third change
--- a/en/examples/backout.manual.clone.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone -r1 myrepo newrepo}
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 2 changes to 1 files
-updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd newrepo}
--- a/en/examples/backout.manual.heads.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$ \textbf{hg heads}
-changeset:
-tag:         tip
-parent:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     back out second change
-
-changeset:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     third change
-
--- a/en/examples/backout.manual.log.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$ \textbf{hg log --style compact}
-3[tip]:1      2009-01-30 06:32 +0000   bos
-  back out second change
-
-2      2009-01-30 06:32 +0000   bos
-  third change
-
-1      2009-01-30 06:32 +0000   bos
-  second change
-
-0      2009-01-30 06:32 +0000   bos
-  first change
-
--- a/en/examples/backout.manual.merge.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$ \textbf{hg merge}
-merging myfile
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-$ \textbf{hg commit -m 'merged backout with previous tip'}
-$ \textbf{cat myfile}
-first change
-third change
--- a/en/examples/backout.manual.parents.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$ \textbf{hg parents}
-changeset:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     third change
-
--- a/en/examples/backout.non-tip.backout.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{echo third change >> myfile}
-$ \textbf{hg commit -m 'third change'}
-$ \textbf{hg backout --merge -m 'back out second change' 1}
-reverting myfile
-created new head
-changeset  backs out changeset
-merging with changeset
-merging myfile
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
--- a/en/examples/backout.non-tip.cat.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{cat myfile}
-first change
-third change
--- a/en/examples/backout.non-tip.clone.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone -r1 myrepo non-tip-repo}
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 2 changes to 1 files
-updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd non-tip-repo}
--- a/en/examples/backout.simple.log.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{hg log --style compact}
-2[tip]      2009-01-30 06:32 +0000   bos
-  back out second change
-
-1      2009-01-30 06:32 +0000   bos
-  second change
-
-0      2009-01-30 06:32 +0000   bos
-  first change
-
--- a/en/examples/backout.simple.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$ \textbf{hg backout -m 'back out second change' tip}
-reverting myfile
-changeset  backs out changeset
-$ \textbf{cat myfile}
-first change
--- a/en/examples/bisect.commits.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
--- a/en/examples/bisect.help.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/en/examples/bisect.init.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-
-
--- a/en/examples/bisect.search.bad-init.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-
-
--- a/en/examples/bisect.search.good-init.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-
-
-
-
--- a/en/examples/bisect.search.init.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-
-
--- a/en/examples/bisect.search.mytest.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
--- a/en/examples/bisect.search.reset.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-
-
--- a/en/examples/bisect.search.rest.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/en/examples/bisect.search.step1.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
--- a/en/examples/bisect.search.step2.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-
-
-
-
-
--- a/en/examples/branch-named.branch.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{hg branch}
-default
--- a/en/examples/branch-named.branches.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$ \textbf{hg tip}
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Initial commit
-
-$ \textbf{hg branches}
-default
--- a/en/examples/branch-named.commit.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{echo 'hello again' >> myfile}
-$ \textbf{hg commit -m 'Second commit'}
-$ \textbf{hg tip}
-changeset:
-branch:      foo
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Second commit
-
--- a/en/examples/branch-named.create.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{hg branch foo}
-marked working directory as branch foo
-$ \textbf{hg branch}
-foo
--- a/en/examples/branch-named.foo-commit.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$ \textbf{echo something > somefile}
-$ \textbf{hg commit -A -m 'New file'}
-adding somefile
-created new head
-$ \textbf{hg heads}
-changeset:
-branch:      foo
-tag:         tip
-parent:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     New file
-
-changeset:
-branch:      bar
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Third commit
-
--- a/en/examples/branch-named.merge.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$ \textbf{hg branch}
-bar
-$ \textbf{hg merge foo}
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-$ \textbf{hg commit -m 'Merge'}
-$ \textbf{hg tip}
-changeset:
-branch:      bar
-tag:         tip
-parent:
-parent:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Merge
-
--- a/en/examples/branch-named.parents.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$ \textbf{hg parents}
-changeset:
-branch:      bar
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Third commit
-
-$ \textbf{hg branches}
-bar
-foo                             (inactive)
-default                         (inactive)
--- a/en/examples/branch-named.rebranch.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$ \textbf{hg branch}
-foo
-$ \textbf{hg branch bar}
-marked working directory as branch bar
-$ \textbf{echo new file > newfile}
-$ \textbf{hg commit -A -m 'Third commit'}
-adding newfile
-$ \textbf{hg tip}
-changeset:
-branch:      bar
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Third commit
-
--- a/en/examples/branch-named.status.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$ \textbf{hg status}
-$ \textbf{hg tip}
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Initial commit
-
--- a/en/examples/branch-named.update-bar.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{hg update bar}
-1 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/en/examples/branch-named.update-foo.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$ \textbf{hg update foo}
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-$ \textbf{hg update}
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{hg parents}
-changeset:
-branch:      foo
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Second commit
-
-$ \textbf{hg update bar}
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/branch-named.update-nothing.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{hg update foo}
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-$ \textbf{hg update}
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/branch-named.update-switchy.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$ \textbf{hg update foo}
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-$ \textbf{hg parents}
-changeset:
-branch:      foo
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Second commit
-
-$ \textbf{hg update bar}
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{hg parents}
-changeset:
-branch:      bar
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Third commit
-
--- a/en/examples/branch-named.update.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$ \textbf{hg update foo}
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-$ \textbf{hg update}
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{hg parent}
-changeset:
-branch:      foo
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Second commit
-
-$ \textbf{hg update bar}
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/branch-repo.bugfix.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$ \textbf{hg clone myproject-1.0.1 my-1.0.1-bugfix}
-updating working directory
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd my-1.0.1-bugfix}
-$ \textbf{echo 'I fixed a bug using only echo!' >> myfile}
-$ \textbf{hg commit -m 'Important fix for 1.0.1'}
-$ \textbf{hg push}
-pushing to
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
--- a/en/examples/branch-repo.clone.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone myproject myproject-1.0.1}
-updating working directory
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/branch-repo.merge.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$ \textbf{hg merge}
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-$ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'}
-$ \textbf{hg push}
-pushing to
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 1 changes to 1 files
--- a/en/examples/branch-repo.new.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone myproject my-feature}
-updating working directory
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd my-feature}
-$ \textbf{echo 'This sure is an exciting new feature!' > mynewfile}
-$ \textbf{hg commit -A -m 'New feature'}
-adding mynewfile
-$ \textbf{hg push}
-pushing to
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
--- a/en/examples/branch-repo.pull.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone myproject myproject-merge}
-updating working directory
-3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd myproject-merge}
-$ \textbf{hg pull ../myproject-1.0.1}
-pulling from ../myproject-1.0.1
-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)
--- a/en/examples/branch-repo.tag.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{cd myproject}
-$ \textbf{hg tag v1.0}
--- a/en/examples/branching.clone.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone -rv1.0 main stable}
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
-updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/branching.init.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$ \textbf{hg init main}
-$ \textbf{cd main}
-$ \textbf{echo 'This is a boring feature.' > myfile}
-$ \textbf{hg commit -A -m 'We have reached an important milestone!'}
-adding myfile
--- a/en/examples/branching.main.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$ \textbf{cd ../main}
-$ \textbf{echo 'This is exciting and new!' >> myfile}
-$ \textbf{hg commit -m 'Add a new feature'}
-$ \textbf{cat myfile}
-This is a boring feature.
-This is exciting and new!
--- a/en/examples/branching.merge.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$ \textbf{cd ../main}
-$ \textbf{hg pull ../stable}
-pulling from ../stable
-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)
-$ \textbf{hg merge}
-merging myfile
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-$ \textbf{hg commit -m 'Bring in bugfix from stable branch'}
-$ \textbf{cat myfile}
-This is a fix to a boring feature.
-This is exciting and new!
--- a/en/examples/branching.stable.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$ \textbf{hg clone stable stable-fix}
-updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd stable-fix}
-$ \textbf{echo 'This is a fix to a boring feature.' > myfile}
-$ \textbf{hg commit -m 'Fix a bug'}
-$ \textbf{hg push}
-pushing to
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
--- a/en/examples/branching.tag.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$ \textbf{hg tag v1.0}
-$ \textbf{hg tip}
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Added tag v1.0 for changeset
-
-$ \textbf{hg tags}
-tip
-v1.0
--- a/en/examples/branching.update.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone -U main main-old}
-$ \textbf{cd main-old}
-$ \textbf{hg update v1.0}
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cat myfile}
-This is a boring feature.
--- a/en/examples/cmdref.diff-p.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$ \textbf{echo '[diff]' >> $HGRC}
-$ \textbf{echo 'showfunc = False' >> $HGRC}
-$ \textbf{hg diff}
-diff -r  myfile.c
-
-
-@@ -1,4 +1,4 @@
- int myfunc()
- \{
--    return 1;
-+    return 10;
- \}
-$ \textbf{hg diff -p}
-diff -r  myfile.c
-
-
-@@ -1,4 +1,4 @@
- int myfunc()
- \{
--    return 1;
-+    return 10;
- \}
--- a/en/examples/daily.copy.after.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{cp a z}
-$ \textbf{hg copy --after a z}
--- a/en/examples/daily.copy.cat.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$ \textbf{cat file}
-line
-new contents
-$ \textbf{cat ../my-copy/new-file}
-line
--- a/en/examples/daily.copy.clone.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone my-copy your-copy}
-updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/daily.copy.copy.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{cd my-copy}
-$ \textbf{hg copy file new-file}
--- a/en/examples/daily.copy.dir-dest.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{mkdir d}
-$ \textbf{hg copy a b d}
-$ \textbf{ls d}
-a  b
--- a/en/examples/daily.copy.dir-src-dest.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{hg copy c d}
-copying c/a/c to d/c/a/c
--- a/en/examples/daily.copy.dir-src.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{hg copy c e}
-copying c/a/c to e/a/c
--- a/en/examples/daily.copy.init.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$ \textbf{hg init my-copy}
-$ \textbf{cd my-copy}
-$ \textbf{echo line > file}
-$ \textbf{hg add file}
-$ \textbf{hg commit -m 'Added a file'}
--- a/en/examples/daily.copy.merge.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$ \textbf{hg pull ../my-copy}
-pulling from ../my-copy
-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)
-$ \textbf{hg merge}
-merging file and new-file to new-file
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-$ \textbf{cat new-file}
-line
-new contents
--- a/en/examples/daily.copy.other.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{cd ../your-copy}
-$ \textbf{echo 'new contents' >> file}
-$ \textbf{hg commit -m 'Changed file'}
--- a/en/examples/daily.copy.simple.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{mkdir k}
-$ \textbf{hg copy a k}
-$ \textbf{ls k}
-a
--- a/en/examples/daily.copy.status-copy.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{hg status -C}
-A new-file
-  file
-$ \textbf{hg commit -m 'Copied file'}
--- a/en/examples/daily.copy.status.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{hg status}
-A new-file
--- a/en/examples/daily.files.add-dir.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{mkdir b}
-$ \textbf{echo b > b/b}
-$ \textbf{echo c > b/c}
-$ \textbf{mkdir b/d}
-$ \textbf{echo d > b/d/d}
-$ \textbf{hg add b}
-adding b/b
-adding b/c
-adding b/d/d
-$ \textbf{hg commit -m 'Added all files in subdirectory'}
--- a/en/examples/daily.files.add.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{hg init add-example}
-$ \textbf{cd add-example}
-$ \textbf{echo a > a}
-$ \textbf{hg status}
-? a
-$ \textbf{hg add a}
-$ \textbf{hg status}
-A a
-$ \textbf{hg commit -m 'Added one file'}
-$ \textbf{hg status}
--- a/en/examples/daily.files.addremove.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$ \textbf{hg init addremove-example}
-$ \textbf{cd addremove-example}
-$ \textbf{echo a > a}
-$ \textbf{echo b > b}
-$ \textbf{hg addremove}
-adding a
-adding b
--- a/en/examples/daily.files.commit-addremove.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{echo c > c}
-$ \textbf{hg commit -A -m 'Commit with addremove'}
-adding c
--- a/en/examples/daily.files.hidden.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$ \textbf{hg init hidden-example}
-$ \textbf{cd hidden-example}
-$ \textbf{mkdir empty}
-$ \textbf{touch empty/.hidden}
-$ \textbf{hg add empty/.hidden}
-$ \textbf{hg commit -m 'Manage an empty-looking directory'}
-$ \textbf{ls empty}
-$ \textbf{cd ..}
-$ \textbf{hg clone hidden-example tmp}
-updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{ls tmp}
-empty
-$ \textbf{ls tmp/empty}
--- a/en/examples/daily.files.missing.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$ \textbf{hg init missing-example}
-$ \textbf{cd missing-example}
-$ \textbf{echo a > a}
-$ \textbf{hg add a}
-$ \textbf{hg commit -m 'File about to be missing'}
-$ \textbf{rm a}
-$ \textbf{hg status}
-! a
--- a/en/examples/daily.files.recover-missing.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{hg revert a}
-$ \textbf{cat a}
-a
-$ \textbf{hg status}
--- a/en/examples/daily.files.remove-after.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{hg remove --after a}
-$ \textbf{hg status}
-R a
--- a/en/examples/daily.files.remove.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$ \textbf{hg init remove-example}
-$ \textbf{cd remove-example}
-$ \textbf{echo a > a}
-$ \textbf{mkdir b}
-$ \textbf{echo b > b/b}
-$ \textbf{hg add a b}
-adding b/b
-$ \textbf{hg commit -m 'Small example for file removal'}
-$ \textbf{hg remove a}
-$ \textbf{hg status}
-R a
-$ \textbf{hg remove b}
-removing b/b
--- a/en/examples/daily.rename.rename.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-$ \textbf{hg rename a b}
--- a/en/examples/daily.rename.status-copy.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{hg status -C}
-A b
-  a
-R a
--- a/en/examples/daily.rename.status.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{hg status}
-A b
-R a
--- a/en/examples/daily.revert.add.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$ \textbf{echo oops > oops}
-$ \textbf{hg add oops}
-$ \textbf{hg status oops}
-A oops
-$ \textbf{hg revert oops}
-$ \textbf{hg status}
-? oops
--- a/en/examples/daily.revert.copy.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{hg copy file new-file}
-$ \textbf{hg revert new-file}
-$ \textbf{hg status}
-? new-file
--- a/en/examples/daily.revert.missing.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$ \textbf{rm file}
-$ \textbf{hg status}
-! file
-$ \textbf{hg revert file}
-$ \textbf{ls file}
-file
--- a/en/examples/daily.revert.modify.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{cat file}
-original content
-$ \textbf{echo unwanted change >> file}
-$ \textbf{hg diff file}
-diff -r  file
-
-
-@@ -1,1 +1,2 @@
- original content
-+unwanted change
--- a/en/examples/daily.revert.remove.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$ \textbf{hg remove file}
-$ \textbf{hg status}
-R file
-$ \textbf{hg revert file}
-$ \textbf{hg status}
-$ \textbf{ls file}
-file
--- a/en/examples/daily.revert.rename-orig.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{hg revert file}
-no changes needed to file
-$ \textbf{hg status}
-? new-file
--- a/en/examples/daily.revert.rename.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{hg rename file new-file}
-$ \textbf{hg revert new-file}
-$ \textbf{hg status}
-? new-file
--- a/en/examples/daily.revert.status.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$ \textbf{hg status}
-? file.orig
-$ \textbf{cat file.orig}
-original content
-unwanted change
--- a/en/examples/daily.revert.unmodify.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$ \textbf{hg status}
-M file
-$ \textbf{hg revert file}
-$ \textbf{cat file}
-original content
--- a/en/examples/extdiff.diff.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$ \textbf{hg diff}
-diff -r  myfile
-
-
-@@ -1,1 +1,2 @@
- The first line.
-+The second line.
--- a/en/examples/extdiff.extdiff-ctx.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$ \textbf{hg extdiff -o -NprcC5}
-
-
-***************
-*** 1 ****
-
-  The first line.
-+ The second line.
--- a/en/examples/extdiff.extdiff.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$ \textbf{hg extdiff}
-
-
-@@ -1 +1,2 @@
- The first line.
-+The second line.
--- a/en/examples/filenames.dirs.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$ \textbf{hg status src}
-? src/main.py
-? src/watcher/_watcher.c
-? src/watcher/watcher.py
-? src/xyzzy.txt
--- a/en/examples/filenames.files.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-$ \textbf{hg add COPYING README examples/simple.py}
--- a/en/examples/filenames.filter.exclude.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{hg status -X '**.py' src}
-? src/watcher/_watcher.c
-? src/xyzzy.txt
--- a/en/examples/filenames.filter.include.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{hg status -I '*.in'}
-? MANIFEST.in
--- a/en/examples/filenames.glob.group.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{hg status 'glob:*.\{in,py\}'}
-? MANIFEST.in
-? setup.py
--- a/en/examples/filenames.glob.question.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{hg status 'glob:**.?'}
-? src/watcher/_watcher.c
--- a/en/examples/filenames.glob.range.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{hg status 'glob:**[nr-t]'}
-? MANIFEST.in
-? src/xyzzy.txt
--- a/en/examples/filenames.glob.star-starstar.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$ \textbf{hg status 'glob:*.py'}
-? setup.py
-$ \textbf{hg status 'glob:**.py'}
-A examples/simple.py
-A src/main.py
-? examples/performant.py
-? setup.py
-? src/watcher/watcher.py
--- a/en/examples/filenames.glob.star.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{hg add 'glob:*.py'}
-adding main.py
--- a/en/examples/filenames.glob.starstar.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg status 'glob:**.py'}
-A examples/simple.py
-A src/main.py
-? examples/performant.py
-? setup.py
-? src/watcher/watcher.py
--- a/en/examples/filenames.wdir-relname.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$ \textbf{hg status}
-A COPYING
-A README
-A examples/simple.py
-? MANIFEST.in
-? examples/performant.py
-? setup.py
-? src/main.py
-? src/watcher/_watcher.c
-? src/watcher/watcher.py
-? src/xyzzy.txt
-$ \textbf{hg status `hg root`}
-A ../COPYING
-A ../README
-A ../examples/simple.py
-? ../MANIFEST.in
-? ../examples/performant.py
-? ../setup.py
-? main.py
-? watcher/_watcher.c
-? watcher/watcher.py
-? xyzzy.txt
--- a/en/examples/filenames.wdir-subdir.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$ \textbf{cd src}
-$ \textbf{hg add -n}
-adding ../MANIFEST.in
-adding ../examples/performant.py
-adding ../setup.py
-adding main.py
-adding watcher/_watcher.c
-adding watcher/watcher.py
-adding xyzzy.txt
-$ \textbf{hg add -n .}
-adding main.py
-adding watcher/_watcher.c
-adding watcher/watcher.py
-adding xyzzy.txt
--- a/en/examples/hook.msglen.go.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{cat .hg/hgrc}
-[hooks]
-pretxncommit.msglen = test `hg tip --template \{desc\} | wc -c` -ge 10
-$ \textbf{echo a > a}
-$ \textbf{hg add a}
-$ \textbf{hg commit -A -m 'too short'}
-transaction abort!
-rollback completed
-abort: pretxncommit.msglen hook exited with status 1
-$ \textbf{hg commit -A -m 'long enough'}
--- a/en/examples/hook.msglen.run.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{cat .hg/hgrc}
-[hooks]
-pretxncommit.msglen = test `hg tip --template \{desc\} | wc -c` -ge 10
-$ \textbf{echo a > a}
-$ \textbf{hg add a}
-$ \textbf{hg commit -A -m 'too short'}
-abort: pretxncommit.msglen hook exited with status 1
-transaction abort!
-rollback completed
-$ \textbf{hg commit -A -m 'long enough'}
--- a/en/examples/hook.simple.ext.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$ \textbf{echo 'commit.when = echo -n "date of commit: "; date' >> .hg/hgrc}
-$ \textbf{echo a >> a}
-$ \textbf{hg commit -m 'i have two hooks'}
-committed
-
--- a/en/examples/hook.simple.init.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$ \textbf{hg init hook-test}
-$ \textbf{cd hook-test}
-$ \textbf{echo '[hooks]' >> .hg/hgrc}
-$ \textbf{echo 'commit = echo committed $HG_NODE' >> .hg/hgrc}
-$ \textbf{cat .hg/hgrc}
-[hooks]
-commit = echo committed $HG_NODE
-$ \textbf{echo a > a}
-$ \textbf{hg add a}
-$ \textbf{hg commit -m 'testing commit hook'}
-committed
--- a/en/examples/hook.simple.pretxncommit.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$ \textbf{cat check_bug_id}
-#!/bin/sh
-# check that a commit comment mentions a numeric bug id
-hg log -r $1 --template \{desc\} | grep -q "\textbackslash{}<bug *[0-9]"
-$ \textbf{echo 'pretxncommit.bug_id_required = ./check_bug_id $HG_NODE' >> .hg/hgrc}
-$ \textbf{echo a >> a}
-$ \textbf{hg commit -m 'i am not mentioning a bug id'}
-transaction abort!
-rollback completed
-abort: pretxncommit.bug_id_required hook exited with status 1
-$ \textbf{hg commit -m 'i refer you to bug 666'}
-committed
-
--- a/en/examples/hook.ws.better.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$ \textbf{cat .hg/hgrc}
-[hooks]
-pretxncommit.whitespace = .hg/check_whitespace.py
-$ \textbf{echo 'a ' >> a}
-$ \textbf{hg commit -A -m 'add new line with trailing whitespace'}
-a, line 2: trailing whitespace added
-commit message saved to .hg/commit.save
-transaction abort!
-rollback completed
-abort: pretxncommit.whitespace hook exited with status 1
-$ \textbf{sed -i 's, *$,,' a}
-$ \textbf{hg commit -A -m 'trimmed trailing whitespace'}
-a, line 2: trailing whitespace added
-commit message saved to .hg/commit.save
-transaction abort!
-rollback completed
-abort: pretxncommit.whitespace hook exited with status 1
--- a/en/examples/hook.ws.simple.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$ \textbf{cat .hg/hgrc}
-[hooks]
-pretxncommit.whitespace = hg export tip | (! egrep -q '^\textbackslash{}+.*[ \textbackslash{}t]$')
-$ \textbf{echo 'a ' > a}
-$ \textbf{hg commit -A -m 'test with trailing whitespace'}
-adding a
-transaction abort!
-rollback completed
-abort: pretxncommit.whitespace hook exited with status 1
-$ \textbf{echo 'a' > a}
-$ \textbf{hg commit -A -m 'drop trailing whitespace and try again'}
--- a/en/examples/issue29.go.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$ \textbf{hg init issue29}
-$ \textbf{cd issue29}
-$ \textbf{echo a > a}
-$ \textbf{hg ci -Ama}
-adding a
-$ \textbf{echo b > b}
-$ \textbf{hg ci -Amb}
-adding b
-$ \textbf{hg up 0}
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-$ \textbf{mkdir b}
-$ \textbf{echo b > b/b}
-$ \textbf{hg ci -Amc}
-adding b/b
-created new head
-$ \textbf{hg merge}
-
--- a/en/examples/mq.dodiff.diff.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$ \textbf{echo 'this is my original thought' > oldfile}
-$ \textbf{echo 'i have changed my mind' > newfile}
-$ \textbf{diff -u oldfile newfile > tiny.patch}
-$ \textbf{cat tiny.patch}
-
-
-@@ -1 +1 @@
--this is my original thought
-+i have changed my mind
-$ \textbf{patch < tiny.patch}
-patching file oldfile
-$ \textbf{cat oldfile}
-i have changed my mind
--- a/en/examples/mq.guards.init.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$ \textbf{hg qinit}
-$ \textbf{hg qnew hello.patch}
-$ \textbf{echo hello > hello}
-$ \textbf{hg add hello}
-$ \textbf{hg qrefresh}
-$ \textbf{hg qnew goodbye.patch}
-$ \textbf{echo goodbye > goodbye}
-$ \textbf{hg add goodbye}
-$ \textbf{hg qrefresh}
--- a/en/examples/mq.guards.qguard.neg.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{hg qguard hello.patch -quux}
-$ \textbf{hg qguard hello.patch}
-hello.patch: -quux
--- a/en/examples/mq.guards.qguard.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{hg qguard}
-goodbye.patch: unguarded
--- a/en/examples/mq.guards.qguard.pos.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{hg qguard +foo}
-$ \textbf{hg qguard}
-goodbye.patch: +foo
--- a/en/examples/mq.guards.qselect.cat.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{cat .hg/patches/guards}
-foo
--- a/en/examples/mq.guards.qselect.error.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{hg qselect +foo}
-abort: guard '+foo' starts with invalid character: '+'
--- a/en/examples/mq.guards.qselect.foo.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$ \textbf{hg qpop -a}
-patch queue now empty
-$ \textbf{hg qselect}
-no active guards
-$ \textbf{hg qselect foo}
-number of unguarded, unapplied patches has changed from 1 to 2
-$ \textbf{hg qselect}
-foo
--- a/en/examples/mq.guards.qselect.foobar.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$ \textbf{hg qselect foo bar}
-number of unguarded, unapplied patches has changed from 0 to 2
-$ \textbf{hg qpop -a}
-no patches applied
-$ \textbf{hg qpush -a}
-applying hello.patch
-applying goodbye.patch
-now at: goodbye.patch
--- a/en/examples/mq.guards.qselect.qpush.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{hg qpush -a}
-applying hello.patch
-applying goodbye.patch
-now at: goodbye.patch
--- a/en/examples/mq.guards.qselect.quux.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$ \textbf{hg qselect quux}
-number of guarded, applied patches has changed from 0 to 2
-$ \textbf{hg qpop -a}
-patch queue now empty
-$ \textbf{hg qpush -a}
-patch series already fully applied
--- a/en/examples/mq.guards.series.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{cat .hg/patches/series}
-hello.patch #-quux
-goodbye.patch #+foo
--- a/en/examples/mq.id.out.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$ \textbf{hg qapplied}
-first.patch
-second.patch
-$ \textbf{hg log -r qbase:qtip}
-changeset:
-tag:         first.patch
-tag:         qbase
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     patch queue: first.patch
-
-changeset:
-tag:         second.patch
-tag:         qtip
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     patch queue: second.patch
-
-$ \textbf{hg export second.patch}
-# HG changeset patch
-# User Bryan O'Sullivan <bos@serpentine.com>
-
-# Node ID
-# Parent
-patch queue: second.patch
-
-diff -r  -r  other.c
-
-
-@@ -0,0 +1,1 @@
-+double u;
--- a/en/examples/mq.id.output.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$ \textbf{hg qapplied}
-first.patch
-second.patch
-$ \textbf{hg log -r qbase:qtip}
-changeset:
-tag:         first.patch
-tag:         qbase
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     [mq]: first.patch
-
-changeset:
-tag:         qtip
-tag:         second.patch
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     [mq]: second.patch
-
-$ \textbf{hg export second.patch}
-# HG changeset patch
-# User Bryan O'Sullivan <bos@serpentine.com>
-
-# Node ID
-# Parent
-[mq]: second.patch
-
-diff -r  -r  other.c
-
-
-@@ -0,0 +1,1 @@
-+double u;
--- a/en/examples/mq.qinit-help.help.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$ \textbf{hg help qinit}
-hg qinit [-c]
-
-init a new queue repository
-
-    The queue repository is unversioned by default. If -c is
-    specified, qinit will create a separate nested repository
-    for patches (qinit -c may also be run later to convert
-    an unversioned patch repository into a versioned one).
-    You can use qcommit to commit changes to this queue repository.
-
-options:
-
- -c --create-repo  create queue repository
-
-use "hg -v help qinit" to show global options
--- a/en/examples/mq.tarball.download.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$ \textbf{download netplug-1.2.5.tar.bz2}
-$ \textbf{tar jxf netplug-1.2.5.tar.bz2}
-$ \textbf{cd netplug-1.2.5}
-$ \textbf{hg init}
-$ \textbf{hg commit -q --addremove --message netplug-1.2.5}
-$ \textbf{cd ..}
-$ \textbf{hg clone netplug-1.2.5 netplug}
-updating working directory
-18 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/mq.tarball.newsource.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$ \textbf{hg qpop -a}
-patch queue now empty
-$ \textbf{cd ..}
-$ \textbf{download netplug-1.2.8.tar.bz2}
-$ \textbf{hg clone netplug-1.2.5 netplug-1.2.8}
-updating working directory
-18 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd netplug-1.2.8}
-$ \textbf{hg locate -0 | xargs -0 rm}
-$ \textbf{cd ..}
-$ \textbf{tar jxf netplug-1.2.8.tar.bz2}
-$ \textbf{cd netplug-1.2.8}
-$ \textbf{hg commit --addremove --message netplug-1.2.8}
--- a/en/examples/mq.tarball.qinit.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$ \textbf{cd netplug}
-$ \textbf{hg qinit}
-$ \textbf{hg qnew -m 'fix build problem with gcc 4' build-fix.patch}
-$ \textbf{perl -pi -e 's/int addr_len/socklen_t addr_len/' netlink.c}
-$ \textbf{hg qrefresh}
-$ \textbf{hg tip -p}
-changeset:
-tag:         qtip
-tag:         build-fix.patch
-tag:         tip
-tag:         qbase
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     fix build problem with gcc 4
-
-diff -r  -r  netlink.c
-
-
-@@ -275,7 +275,7 @@
-         exit(1);
-     \}
-
--    int addr_len = sizeof(addr);
-+    socklen_t addr_len = sizeof(addr);
-
-     if (getsockname(fd, (struct sockaddr *) &addr, &addr_len) == -1) \{
-         do_log(LOG_ERR, "Could not get socket details: %m");
-
--- a/en/examples/mq.tarball.repush.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$ \textbf{cd ../netplug}
-$ \textbf{hg pull ../netplug-1.2.8}
-pulling from ../netplug-1.2.8
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 12 changes to 12 files
-(run 'hg update' to get a working copy)
-$ \textbf{hg qpush -a}
-(working directory not at tip)
-applying build-fix.patch
-now at: build-fix.patch
--- a/en/examples/mq.tools.lsdiff.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$ \textbf{lsdiff -nvv remove-redundant-null-checks.patch}
-22	File #1  	a/drivers/char/agp/sgi-agp.c
-	24	Hunk #1	static int __devinit agp_sgi_init(void)
-37	File #2  	a/drivers/char/hvcs.c
-	39	Hunk #1	static struct tty_operations hvcs_ops =
-	53	Hunk #2	static int hvcs_alloc_index_list(int n)
-69	File #3  	a/drivers/message/fusion/mptfc.c
-	71	Hunk #1	mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, in
-85	File #4  	a/drivers/message/fusion/mptsas.c
-	87	Hunk #1	mptsas_probe_hba_phys(MPT_ADAPTER *ioc)
-98	File #5  	a/drivers/net/fs_enet/fs_enet-mii.c
-	100	Hunk #1	static struct fs_enet_mii_bus *create_bu
-111	File #6  	a/drivers/net/wireless/ipw2200.c
-	113	Hunk #1	static struct ipw_fw_error *ipw_alloc_er
-	126	Hunk #2	static ssize_t clear_error(struct device
-	140	Hunk #3	static void ipw_irq_tasklet(struct ipw_p
-	150	Hunk #4	static void ipw_pci_remove(struct pci_de
-164	File #7  	a/drivers/scsi/libata-scsi.c
-	166	Hunk #1	int ata_cmd_ioctl(struct scsi_device *sc
-178	File #8  	a/drivers/video/au1100fb.c
-	180	Hunk #1	void __exit au1100fb_cleanup(void)
--- a/en/examples/mq.tools.tools.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$ \textbf{diffstat -p1 remove-redundant-null-checks.patch}
- drivers/char/agp/sgi-agp.c        |    5 ++---
- drivers/char/hvcs.c               |   11 +++++------
- drivers/message/fusion/mptfc.c    |    6 ++----
- drivers/message/fusion/mptsas.c   |    3 +--
- drivers/net/fs_enet/fs_enet-mii.c |    3 +--
- drivers/net/wireless/ipw2200.c    |   22 ++++++----------------
- drivers/scsi/libata-scsi.c        |    4 +---
- drivers/video/au1100fb.c          |    3 +--
- 8 files changed, 19 insertions(+), 38 deletions(-)
-$ \textbf{filterdiff -i '*/video/*' remove-redundant-null-checks.patch}
-
-
-@@ -743,8 +743,7 @@ void __exit au1100fb_cleanup(void)
- \{
- 	driver_unregister(&au1100fb_driver);
-
--	if (drv_info.opt_mode)
--		kfree(drv_info.opt_mode);
-+	kfree(drv_info.opt_mode);
- \}
-
- module_init(au1100fb_init);
--- a/en/examples/mq.tutorial.add.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{echo 'file 3, line 1' >> file3}
-$ \textbf{hg qnew add-file3.patch}
-$ \textbf{hg qnew -f add-file3.patch}
-abort: patch "add-file3.patch" already exists
--- a/en/examples/mq.tutorial.qinit.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$ \textbf{hg init mq-sandbox}
-$ \textbf{cd mq-sandbox}
-$ \textbf{echo 'line 1' > file1}
-$ \textbf{echo 'another line 1' > file2}
-$ \textbf{hg add file1 file2}
-$ \textbf{hg commit -m'first change'}
-$ \textbf{hg qinit}
--- a/en/examples/mq.tutorial.qnew.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$ \textbf{hg tip}
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     first change
-
-$ \textbf{hg qnew first.patch}
-$ \textbf{hg tip}
-changeset:
-tag:         qtip
-tag:         first.patch
-tag:         tip
-tag:         qbase
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     [mq]: first.patch
-
-$ \textbf{ls .hg/patches}
-first.patch  series  status
--- a/en/examples/mq.tutorial.qnew2.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$ \textbf{hg qnew second.patch}
-$ \textbf{hg log --style=compact --limit=2}
-2[qtip,second.patch,tip]      2009-01-30 06:34 +0000   bos
-  [mq]: second.patch
-
-1[first.patch,qbase]      2009-01-30 06:34 +0000   bos
-  [mq]: first.patch
-
-$ \textbf{echo 'line 4' >> file1}
-$ \textbf{hg qrefresh}
-$ \textbf{hg tip --style=compact --patch}
-2[qtip,second.patch,tip]      2009-01-30 06:34 +0000   bos
-  [mq]: second.patch
-
-diff -r  -r  file1
-
-
-@@ -1,3 +1,4 @@
- line 1
- line 2
- line 3
-+line 4
-
-$ \textbf{hg annotate file1}
-0: line 1
-1: line 2
-1: line 3
-2: line 4
--- a/en/examples/mq.tutorial.qpop.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$ \textbf{hg qapplied}
-first.patch
-second.patch
-$ \textbf{hg qpop}
-now at: first.patch
-$ \textbf{hg qseries}
-first.patch
-second.patch
-$ \textbf{hg qapplied}
-first.patch
-$ \textbf{cat file1}
-line 1
-line 2
-line 3
--- a/en/examples/mq.tutorial.qpush-a.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$ \textbf{hg qpush -a}
-applying second.patch
-now at: second.patch
-$ \textbf{cat file1}
-line 1
-line 2
-line 3
-line 4
--- a/en/examples/mq.tutorial.qrefresh.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$ \textbf{echo 'line 2' >> file1}
-$ \textbf{hg diff}
-diff -r  file1
-
-
-@@ -1,1 +1,2 @@
- line 1
-+line 2
-$ \textbf{hg qrefresh}
-$ \textbf{hg diff}
-$ \textbf{hg tip --style=compact --patch}
-1[qtip,first.patch,tip,qbase]      2009-01-30 06:34 +0000   bos
-  [mq]: first.patch
-
-diff -r  -r  file1
-
-
-@@ -1,1 +1,2 @@
- line 1
-+line 2
-
--- a/en/examples/mq.tutorial.qrefresh2.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$ \textbf{echo 'line 3' >> file1}
-$ \textbf{hg status}
-M file1
-$ \textbf{hg qrefresh}
-$ \textbf{hg tip --style=compact --patch}
-1[qtip,first.patch,tip,qbase]      2009-01-30 06:34 +0000   bos
-  [mq]: first.patch
-
-diff -r  -r  file1
-
-
-@@ -1,1 +1,3 @@
- line 1
-+line 2
-+line 3
-
--- a/en/examples/mq.tutorial.qseries.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$ \textbf{hg qseries}
-first.patch
-second.patch
-$ \textbf{hg qapplied}
-first.patch
-second.patch
--- a/en/examples/rename.divergent.clone.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$ \textbf{hg clone orig anne}
-updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{hg clone orig bob}
-updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/rename.divergent.merge.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# See http://www.selenic.com/mercurial/bts/issue455
-$ \textbf{cd ../orig}
-$ \textbf{hg pull -u ../anne}
-pulling from ../anne
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
-1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-$ \textbf{hg pull ../bob}
-pulling from ../bob
-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)
-$ \textbf{hg merge}
-warning: detected divergent renames of foo to:
- bar
- quux
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-$ \textbf{ls}
-bar  quux
--- a/en/examples/rename.divergent.rename.anne.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{cd anne}
-$ \textbf{hg mv foo bar}
-$ \textbf{hg ci -m 'Rename foo to bar'}
--- a/en/examples/rename.divergent.rename.bob.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{cd ../bob}
-$ \textbf{hg mv foo quux}
-$ \textbf{hg ci -m 'Rename foo to quux'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/backout.init.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+$ \textbf{hg init myrepo}
+$ \textbf{cd myrepo}
+$ \textbf{echo first change >> myfile}
+$ \textbf{hg add myfile}
+$ \textbf{hg commit -m 'first change'}
+$ \textbf{echo second change >> myfile}
+$ \textbf{hg commit -m 'second change'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/backout.manual.backout.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,8 @@
+$ \textbf{echo third change >> myfile}
+$ \textbf{hg commit -m 'third change'}
+$ \textbf{hg backout -m 'back out second change' 1}
+reverting myfile
+created new head
+changeset  backs out changeset
+the backout changeset is a new head - do not forget to merge
+(use "backout --merge" if you want to auto-merge)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/backout.manual.cat.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{cat myfile}
+first change
+second change
+third change
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/backout.manual.clone.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone -r1 myrepo newrepo}
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 2 changesets with 2 changes to 1 files
+updating working directory
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cd newrepo}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/backout.manual.heads.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,13 @@
+$ \textbf{hg heads}
+changeset:
+tag:         tip
+parent:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     back out second change
+
+changeset:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     third change
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/backout.manual.log.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,13 @@
+$ \textbf{hg log --style compact}
+3[tip]:1      2009-01-30 06:32 +0000   bos
+  back out second change
+
+2      2009-01-30 06:32 +0000   bos
+  third change
+
+1      2009-01-30 06:32 +0000   bos
+  second change
+
+0      2009-01-30 06:32 +0000   bos
+  first change
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/backout.manual.merge.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,8 @@
+$ \textbf{hg merge}
+merging myfile
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+$ \textbf{hg commit -m 'merged backout with previous tip'}
+$ \textbf{cat myfile}
+first change
+third change
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/backout.manual.parents.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,6 @@
+$ \textbf{hg parents}
+changeset:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     third change
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/backout.non-tip.backout.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{echo third change >> myfile}
+$ \textbf{hg commit -m 'third change'}
+$ \textbf{hg backout --merge -m 'back out second change' 1}
+reverting myfile
+created new head
+changeset  backs out changeset
+merging with changeset
+merging myfile
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/backout.non-tip.cat.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{cat myfile}
+first change
+third change
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/backout.non-tip.clone.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone -r1 myrepo non-tip-repo}
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 2 changesets with 2 changes to 1 files
+updating working directory
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cd non-tip-repo}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/backout.simple.log.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{hg log --style compact}
+2[tip]      2009-01-30 06:32 +0000   bos
+  back out second change
+
+1      2009-01-30 06:32 +0000   bos
+  second change
+
+0      2009-01-30 06:32 +0000   bos
+  first change
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/backout.simple.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,5 @@
+$ \textbf{hg backout -m 'back out second change' tip}
+reverting myfile
+changeset  backs out changeset
+$ \textbf{cat myfile}
+first change
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/bisect.commits.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/bisect.help.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/bisect.init.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/bisect.search.bad-init.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/bisect.search.good-init.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/bisect.search.init.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/bisect.search.mytest.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/bisect.search.reset.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/bisect.search.rest.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/bisect.search.step1.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/bisect.search.step2.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,5 @@
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-named.branch.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{hg branch}
+default
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-named.branches.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,9 @@
+$ \textbf{hg tip}
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Initial commit
+
+$ \textbf{hg branches}
+default
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-named.commit.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{echo 'hello again' >> myfile}
+$ \textbf{hg commit -m 'Second commit'}
+$ \textbf{hg tip}
+changeset:
+branch:      foo
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Second commit
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-named.create.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{hg branch foo}
+marked working directory as branch foo
+$ \textbf{hg branch}
+foo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-named.foo-commit.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,19 @@
+$ \textbf{echo something > somefile}
+$ \textbf{hg commit -A -m 'New file'}
+adding somefile
+created new head
+$ \textbf{hg heads}
+changeset:
+branch:      foo
+tag:         tip
+parent:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     New file
+
+changeset:
+branch:      bar
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Third commit
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-named.merge.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,16 @@
+$ \textbf{hg branch}
+bar
+$ \textbf{hg merge foo}
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+$ \textbf{hg commit -m 'Merge'}
+$ \textbf{hg tip}
+changeset:
+branch:      bar
+tag:         tip
+parent:
+parent:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Merge
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-named.parents.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,12 @@
+$ \textbf{hg parents}
+changeset:
+branch:      bar
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Third commit
+
+$ \textbf{hg branches}
+bar
+foo                             (inactive)
+default                         (inactive)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-named.rebranch.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,15 @@
+$ \textbf{hg branch}
+foo
+$ \textbf{hg branch bar}
+marked working directory as branch bar
+$ \textbf{echo new file > newfile}
+$ \textbf{hg commit -A -m 'Third commit'}
+adding newfile
+$ \textbf{hg tip}
+changeset:
+branch:      bar
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Third commit
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-named.status.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,8 @@
+$ \textbf{hg status}
+$ \textbf{hg tip}
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Initial commit
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-named.update-bar.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{hg update bar}
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-named.update-foo.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,13 @@
+$ \textbf{hg update foo}
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+$ \textbf{hg update}
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{hg parents}
+changeset:
+branch:      foo
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Second commit
+
+$ \textbf{hg update bar}
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-named.update-nothing.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{hg update foo}
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+$ \textbf{hg update}
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-named.update-switchy.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,19 @@
+$ \textbf{hg update foo}
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+$ \textbf{hg parents}
+changeset:
+branch:      foo
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Second commit
+
+$ \textbf{hg update bar}
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{hg parents}
+changeset:
+branch:      bar
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Third commit
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-named.update.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,13 @@
+$ \textbf{hg update foo}
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+$ \textbf{hg update}
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{hg parent}
+changeset:
+branch:      foo
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Second commit
+
+$ \textbf{hg update bar}
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-repo.bugfix.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,13 @@
+$ \textbf{hg clone myproject-1.0.1 my-1.0.1-bugfix}
+updating working directory
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cd my-1.0.1-bugfix}
+$ \textbf{echo 'I fixed a bug using only echo!' >> myfile}
+$ \textbf{hg commit -m 'Important fix for 1.0.1'}
+$ \textbf{hg push}
+pushing to
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-repo.clone.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone myproject myproject-1.0.1}
+updating working directory
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-repo.merge.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,11 @@
+$ \textbf{hg merge}
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+$ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'}
+$ \textbf{hg push}
+pushing to
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 2 changesets with 1 changes to 1 files
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-repo.new.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,15 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone myproject my-feature}
+updating working directory
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cd my-feature}
+$ \textbf{echo 'This sure is an exciting new feature!' > mynewfile}
+$ \textbf{hg commit -A -m 'New feature'}
+adding mynewfile
+$ \textbf{hg push}
+pushing to
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-repo.pull.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,13 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone myproject myproject-merge}
+updating working directory
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cd myproject-merge}
+$ \textbf{hg pull ../myproject-1.0.1}
+pulling from ../myproject-1.0.1
+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)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branch-repo.tag.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{cd myproject}
+$ \textbf{hg tag v1.0}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branching.clone.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,9 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone -rv1.0 main stable}
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+updating working directory
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branching.init.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,5 @@
+$ \textbf{hg init main}
+$ \textbf{cd main}
+$ \textbf{echo 'This is a boring feature.' > myfile}
+$ \textbf{hg commit -A -m 'We have reached an important milestone!'}
+adding myfile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branching.main.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,6 @@
+$ \textbf{cd ../main}
+$ \textbf{echo 'This is exciting and new!' >> myfile}
+$ \textbf{hg commit -m 'Add a new feature'}
+$ \textbf{cat myfile}
+This is a boring feature.
+This is exciting and new!
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branching.merge.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,17 @@
+$ \textbf{cd ../main}
+$ \textbf{hg pull ../stable}
+pulling from ../stable
+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)
+$ \textbf{hg merge}
+merging myfile
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+$ \textbf{hg commit -m 'Bring in bugfix from stable branch'}
+$ \textbf{cat myfile}
+This is a fix to a boring feature.
+This is exciting and new!
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branching.stable.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,13 @@
+$ \textbf{hg clone stable stable-fix}
+updating working directory
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cd stable-fix}
+$ \textbf{echo 'This is a fix to a boring feature.' > myfile}
+$ \textbf{hg commit -m 'Fix a bug'}
+$ \textbf{hg push}
+pushing to
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branching.tag.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,11 @@
+$ \textbf{hg tag v1.0}
+$ \textbf{hg tip}
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Added tag v1.0 for changeset
+
+$ \textbf{hg tags}
+tip
+v1.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/branching.update.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone -U main main-old}
+$ \textbf{cd main-old}
+$ \textbf{hg update v1.0}
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cat myfile}
+This is a boring feature.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/cmdref.diff-p.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,22 @@
+$ \textbf{echo '[diff]' >> $HGRC}
+$ \textbf{echo 'showfunc = False' >> $HGRC}
+$ \textbf{hg diff}
+diff -r  myfile.c
+
+
+@@ -1,4 +1,4 @@
+ int myfunc()
+ \{
+-    return 1;
++    return 10;
+ \}
+$ \textbf{hg diff -p}
+diff -r  myfile.c
+
+
+@@ -1,4 +1,4 @@
+ int myfunc()
+ \{
+-    return 1;
++    return 10;
+ \}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.copy.after.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{cp a z}
+$ \textbf{hg copy --after a z}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.copy.cat.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,5 @@
+$ \textbf{cat file}
+line
+new contents
+$ \textbf{cat ../my-copy/new-file}
+line
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.copy.clone.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone my-copy your-copy}
+updating working directory
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.copy.copy.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{cd my-copy}
+$ \textbf{hg copy file new-file}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.copy.dir-dest.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{mkdir d}
+$ \textbf{hg copy a b d}
+$ \textbf{ls d}
+a  b
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.copy.dir-src-dest.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{hg copy c d}
+copying c/a/c to d/c/a/c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.copy.dir-src.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{hg copy c e}
+copying c/a/c to e/a/c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.copy.init.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,5 @@
+$ \textbf{hg init my-copy}
+$ \textbf{cd my-copy}
+$ \textbf{echo line > file}
+$ \textbf{hg add file}
+$ \textbf{hg commit -m 'Added a file'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.copy.merge.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,15 @@
+$ \textbf{hg pull ../my-copy}
+pulling from ../my-copy
+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)
+$ \textbf{hg merge}
+merging file and new-file to new-file
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+$ \textbf{cat new-file}
+line
+new contents
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.copy.other.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{cd ../your-copy}
+$ \textbf{echo 'new contents' >> file}
+$ \textbf{hg commit -m 'Changed file'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.copy.simple.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{mkdir k}
+$ \textbf{hg copy a k}
+$ \textbf{ls k}
+a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.copy.status-copy.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{hg status -C}
+A new-file
+  file
+$ \textbf{hg commit -m 'Copied file'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.copy.status.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{hg status}
+A new-file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.files.add-dir.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{mkdir b}
+$ \textbf{echo b > b/b}
+$ \textbf{echo c > b/c}
+$ \textbf{mkdir b/d}
+$ \textbf{echo d > b/d/d}
+$ \textbf{hg add b}
+adding b/b
+adding b/c
+adding b/d/d
+$ \textbf{hg commit -m 'Added all files in subdirectory'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.files.add.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{hg init add-example}
+$ \textbf{cd add-example}
+$ \textbf{echo a > a}
+$ \textbf{hg status}
+? a
+$ \textbf{hg add a}
+$ \textbf{hg status}
+A a
+$ \textbf{hg commit -m 'Added one file'}
+$ \textbf{hg status}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.files.addremove.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+$ \textbf{hg init addremove-example}
+$ \textbf{cd addremove-example}
+$ \textbf{echo a > a}
+$ \textbf{echo b > b}
+$ \textbf{hg addremove}
+adding a
+adding b
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.files.commit-addremove.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{echo c > c}
+$ \textbf{hg commit -A -m 'Commit with addremove'}
+adding c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.files.hidden.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,14 @@
+$ \textbf{hg init hidden-example}
+$ \textbf{cd hidden-example}
+$ \textbf{mkdir empty}
+$ \textbf{touch empty/.hidden}
+$ \textbf{hg add empty/.hidden}
+$ \textbf{hg commit -m 'Manage an empty-looking directory'}
+$ \textbf{ls empty}
+$ \textbf{cd ..}
+$ \textbf{hg clone hidden-example tmp}
+updating working directory
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{ls tmp}
+empty
+$ \textbf{ls tmp/empty}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.files.missing.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,8 @@
+$ \textbf{hg init missing-example}
+$ \textbf{cd missing-example}
+$ \textbf{echo a > a}
+$ \textbf{hg add a}
+$ \textbf{hg commit -m 'File about to be missing'}
+$ \textbf{rm a}
+$ \textbf{hg status}
+! a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.files.recover-missing.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{hg revert a}
+$ \textbf{cat a}
+a
+$ \textbf{hg status}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.files.remove-after.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{hg remove --after a}
+$ \textbf{hg status}
+R a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.files.remove.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,13 @@
+$ \textbf{hg init remove-example}
+$ \textbf{cd remove-example}
+$ \textbf{echo a > a}
+$ \textbf{mkdir b}
+$ \textbf{echo b > b/b}
+$ \textbf{hg add a b}
+adding b/b
+$ \textbf{hg commit -m 'Small example for file removal'}
+$ \textbf{hg remove a}
+$ \textbf{hg status}
+R a
+$ \textbf{hg remove b}
+removing b/b
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.rename.rename.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,1 @@
+$ \textbf{hg rename a b}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.rename.status-copy.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{hg status -C}
+A b
+  a
+R a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.rename.status.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{hg status}
+A b
+R a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.revert.add.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+$ \textbf{echo oops > oops}
+$ \textbf{hg add oops}
+$ \textbf{hg status oops}
+A oops
+$ \textbf{hg revert oops}
+$ \textbf{hg status}
+? oops
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.revert.copy.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{hg copy file new-file}
+$ \textbf{hg revert new-file}
+$ \textbf{hg status}
+? new-file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.revert.missing.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,6 @@
+$ \textbf{rm file}
+$ \textbf{hg status}
+! file
+$ \textbf{hg revert file}
+$ \textbf{ls file}
+file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.revert.modify.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{cat file}
+original content
+$ \textbf{echo unwanted change >> file}
+$ \textbf{hg diff file}
+diff -r  file
+
+
+@@ -1,1 +1,2 @@
+ original content
++unwanted change
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.revert.remove.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+$ \textbf{hg remove file}
+$ \textbf{hg status}
+R file
+$ \textbf{hg revert file}
+$ \textbf{hg status}
+$ \textbf{ls file}
+file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.revert.rename-orig.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{hg revert file}
+no changes needed to file
+$ \textbf{hg status}
+? new-file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.revert.rename.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{hg rename file new-file}
+$ \textbf{hg revert new-file}
+$ \textbf{hg status}
+? new-file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.revert.status.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,5 @@
+$ \textbf{hg status}
+? file.orig
+$ \textbf{cat file.orig}
+original content
+unwanted change
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/daily.revert.unmodify.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,5 @@
+$ \textbf{hg status}
+M file
+$ \textbf{hg revert file}
+$ \textbf{cat file}
+original content
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/extdiff.diff.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+$ \textbf{hg diff}
+diff -r  myfile
+
+
+@@ -1,1 +1,2 @@
+ The first line.
++The second line.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/extdiff.extdiff-ctx.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,8 @@
+$ \textbf{hg extdiff -o -NprcC5}
+
+
+***************
+*** 1 ****
+
+  The first line.
++ The second line.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/extdiff.extdiff.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,6 @@
+$ \textbf{hg extdiff}
+
+
+@@ -1 +1,2 @@
+ The first line.
++The second line.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/filenames.dirs.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,5 @@
+$ \textbf{hg status src}
+? src/main.py
+? src/watcher/_watcher.c
+? src/watcher/watcher.py
+? src/xyzzy.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/filenames.files.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,1 @@
+$ \textbf{hg add COPYING README examples/simple.py}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/filenames.filter.exclude.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{hg status -X '**.py' src}
+? src/watcher/_watcher.c
+? src/xyzzy.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/filenames.filter.include.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{hg status -I '*.in'}
+? MANIFEST.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/filenames.glob.group.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{hg status 'glob:*.\{in,py\}'}
+? MANIFEST.in
+? setup.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/filenames.glob.question.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{hg status 'glob:**.?'}
+? src/watcher/_watcher.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/filenames.glob.range.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{hg status 'glob:**[nr-t]'}
+? MANIFEST.in
+? src/xyzzy.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/filenames.glob.star-starstar.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,8 @@
+$ \textbf{hg status 'glob:*.py'}
+? setup.py
+$ \textbf{hg status 'glob:**.py'}
+A examples/simple.py
+A src/main.py
+? examples/performant.py
+? setup.py
+? src/watcher/watcher.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/filenames.glob.star.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{hg add 'glob:*.py'}
+adding main.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/filenames.glob.starstar.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+$ \textbf{cd ..}
+$ \textbf{hg status 'glob:**.py'}
+A examples/simple.py
+A src/main.py
+? examples/performant.py
+? setup.py
+? src/watcher/watcher.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/filenames.wdir-relname.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,22 @@
+$ \textbf{hg status}
+A COPYING
+A README
+A examples/simple.py
+? MANIFEST.in
+? examples/performant.py
+? setup.py
+? src/main.py
+? src/watcher/_watcher.c
+? src/watcher/watcher.py
+? src/xyzzy.txt
+$ \textbf{hg status `hg root`}
+A ../COPYING
+A ../README
+A ../examples/simple.py
+? ../MANIFEST.in
+? ../examples/performant.py
+? ../setup.py
+? main.py
+? watcher/_watcher.c
+? watcher/watcher.py
+? xyzzy.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/filenames.wdir-subdir.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,14 @@
+$ \textbf{cd src}
+$ \textbf{hg add -n}
+adding ../MANIFEST.in
+adding ../examples/performant.py
+adding ../setup.py
+adding main.py
+adding watcher/_watcher.c
+adding watcher/watcher.py
+adding xyzzy.txt
+$ \textbf{hg add -n .}
+adding main.py
+adding watcher/_watcher.c
+adding watcher/watcher.py
+adding xyzzy.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/hook.msglen.go.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{cat .hg/hgrc}
+[hooks]
+pretxncommit.msglen = test `hg tip --template \{desc\} | wc -c` -ge 10
+$ \textbf{echo a > a}
+$ \textbf{hg add a}
+$ \textbf{hg commit -A -m 'too short'}
+transaction abort!
+rollback completed
+abort: pretxncommit.msglen hook exited with status 1
+$ \textbf{hg commit -A -m 'long enough'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/hook.msglen.run.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{cat .hg/hgrc}
+[hooks]
+pretxncommit.msglen = test `hg tip --template \{desc\} | wc -c` -ge 10
+$ \textbf{echo a > a}
+$ \textbf{hg add a}
+$ \textbf{hg commit -A -m 'too short'}
+abort: pretxncommit.msglen hook exited with status 1
+transaction abort!
+rollback completed
+$ \textbf{hg commit -A -m 'long enough'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/hook.simple.ext.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,5 @@
+$ \textbf{echo 'commit.when = echo -n "date of commit: "; date' >> .hg/hgrc}
+$ \textbf{echo a >> a}
+$ \textbf{hg commit -m 'i have two hooks'}
+committed
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/hook.simple.init.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,11 @@
+$ \textbf{hg init hook-test}
+$ \textbf{cd hook-test}
+$ \textbf{echo '[hooks]' >> .hg/hgrc}
+$ \textbf{echo 'commit = echo committed $HG_NODE' >> .hg/hgrc}
+$ \textbf{cat .hg/hgrc}
+[hooks]
+commit = echo committed $HG_NODE
+$ \textbf{echo a > a}
+$ \textbf{hg add a}
+$ \textbf{hg commit -m 'testing commit hook'}
+committed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/hook.simple.pretxncommit.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,13 @@
+$ \textbf{cat check_bug_id}
+#!/bin/sh
+# check that a commit comment mentions a numeric bug id
+hg log -r $1 --template \{desc\} | grep -q "\textbackslash{}<bug *[0-9]"
+$ \textbf{echo 'pretxncommit.bug_id_required = ./check_bug_id $HG_NODE' >> .hg/hgrc}
+$ \textbf{echo a >> a}
+$ \textbf{hg commit -m 'i am not mentioning a bug id'}
+transaction abort!
+rollback completed
+abort: pretxncommit.bug_id_required hook exited with status 1
+$ \textbf{hg commit -m 'i refer you to bug 666'}
+committed
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/hook.ws.better.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,17 @@
+$ \textbf{cat .hg/hgrc}
+[hooks]
+pretxncommit.whitespace = .hg/check_whitespace.py
+$ \textbf{echo 'a ' >> a}
+$ \textbf{hg commit -A -m 'add new line with trailing whitespace'}
+a, line 2: trailing whitespace added
+commit message saved to .hg/commit.save
+transaction abort!
+rollback completed
+abort: pretxncommit.whitespace hook exited with status 1
+$ \textbf{sed -i 's, *$,,' a}
+$ \textbf{hg commit -A -m 'trimmed trailing whitespace'}
+a, line 2: trailing whitespace added
+commit message saved to .hg/commit.save
+transaction abort!
+rollback completed
+abort: pretxncommit.whitespace hook exited with status 1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/hook.ws.simple.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,11 @@
+$ \textbf{cat .hg/hgrc}
+[hooks]
+pretxncommit.whitespace = hg export tip | (! egrep -q '^\textbackslash{}+.*[ \textbackslash{}t]$')
+$ \textbf{echo 'a ' > a}
+$ \textbf{hg commit -A -m 'test with trailing whitespace'}
+adding a
+transaction abort!
+rollback completed
+abort: pretxncommit.whitespace hook exited with status 1
+$ \textbf{echo 'a' > a}
+$ \textbf{hg commit -A -m 'drop trailing whitespace and try again'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/issue29.go.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,17 @@
+$ \textbf{hg init issue29}
+$ \textbf{cd issue29}
+$ \textbf{echo a > a}
+$ \textbf{hg ci -Ama}
+adding a
+$ \textbf{echo b > b}
+$ \textbf{hg ci -Amb}
+adding b
+$ \textbf{hg up 0}
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+$ \textbf{mkdir b}
+$ \textbf{echo b > b/b}
+$ \textbf{hg ci -Amc}
+adding b/b
+created new head
+$ \textbf{hg merge}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.dodiff.diff.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,13 @@
+$ \textbf{echo 'this is my original thought' > oldfile}
+$ \textbf{echo 'i have changed my mind' > newfile}
+$ \textbf{diff -u oldfile newfile > tiny.patch}
+$ \textbf{cat tiny.patch}
+
+
+@@ -1 +1 @@
+-this is my original thought
++i have changed my mind
+$ \textbf{patch < tiny.patch}
+patching file oldfile
+$ \textbf{cat oldfile}
+i have changed my mind
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.guards.init.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,9 @@
+$ \textbf{hg qinit}
+$ \textbf{hg qnew hello.patch}
+$ \textbf{echo hello > hello}
+$ \textbf{hg add hello}
+$ \textbf{hg qrefresh}
+$ \textbf{hg qnew goodbye.patch}
+$ \textbf{echo goodbye > goodbye}
+$ \textbf{hg add goodbye}
+$ \textbf{hg qrefresh}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.guards.qguard.neg.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{hg qguard hello.patch -quux}
+$ \textbf{hg qguard hello.patch}
+hello.patch: -quux
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.guards.qguard.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{hg qguard}
+goodbye.patch: unguarded
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.guards.qguard.pos.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{hg qguard +foo}
+$ \textbf{hg qguard}
+goodbye.patch: +foo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.guards.qselect.cat.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{cat .hg/patches/guards}
+foo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.guards.qselect.error.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{hg qselect +foo}
+abort: guard '+foo' starts with invalid character: '+'
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.guards.qselect.foo.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,8 @@
+$ \textbf{hg qpop -a}
+patch queue now empty
+$ \textbf{hg qselect}
+no active guards
+$ \textbf{hg qselect foo}
+number of unguarded, unapplied patches has changed from 1 to 2
+$ \textbf{hg qselect}
+foo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.guards.qselect.foobar.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,8 @@
+$ \textbf{hg qselect foo bar}
+number of unguarded, unapplied patches has changed from 0 to 2
+$ \textbf{hg qpop -a}
+no patches applied
+$ \textbf{hg qpush -a}
+applying hello.patch
+applying goodbye.patch
+now at: goodbye.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.guards.qselect.qpush.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{hg qpush -a}
+applying hello.patch
+applying goodbye.patch
+now at: goodbye.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.guards.qselect.quux.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,6 @@
+$ \textbf{hg qselect quux}
+number of guarded, applied patches has changed from 0 to 2
+$ \textbf{hg qpop -a}
+patch queue now empty
+$ \textbf{hg qpush -a}
+patch series already fully applied
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.guards.series.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{cat .hg/patches/series}
+hello.patch #-quux
+goodbye.patch #+foo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.id.out.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,32 @@
+$ \textbf{hg qapplied}
+first.patch
+second.patch
+$ \textbf{hg log -r qbase:qtip}
+changeset:
+tag:         first.patch
+tag:         qbase
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     patch queue: first.patch
+
+changeset:
+tag:         second.patch
+tag:         qtip
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     patch queue: second.patch
+
+$ \textbf{hg export second.patch}
+# HG changeset patch
+# User Bryan O'Sullivan <bos@serpentine.com>
+
+# Node ID
+# Parent
+patch queue: second.patch
+
+diff -r  -r  other.c
+
+
+@@ -0,0 +1,1 @@
++double u;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.id.output.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,32 @@
+$ \textbf{hg qapplied}
+first.patch
+second.patch
+$ \textbf{hg log -r qbase:qtip}
+changeset:
+tag:         first.patch
+tag:         qbase
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     [mq]: first.patch
+
+changeset:
+tag:         qtip
+tag:         second.patch
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     [mq]: second.patch
+
+$ \textbf{hg export second.patch}
+# HG changeset patch
+# User Bryan O'Sullivan <bos@serpentine.com>
+
+# Node ID
+# Parent
+[mq]: second.patch
+
+diff -r  -r  other.c
+
+
+@@ -0,0 +1,1 @@
++double u;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.qinit-help.help.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,16 @@
+$ \textbf{hg help qinit}
+hg qinit [-c]
+
+init a new queue repository
+
+    The queue repository is unversioned by default. If -c is
+    specified, qinit will create a separate nested repository
+    for patches (qinit -c may also be run later to convert
+    an unversioned patch repository into a versioned one).
+    You can use qcommit to commit changes to this queue repository.
+
+options:
+
+ -c --create-repo  create queue repository
+
+use "hg -v help qinit" to show global options
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.tarball.download.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,9 @@
+$ \textbf{download netplug-1.2.5.tar.bz2}
+$ \textbf{tar jxf netplug-1.2.5.tar.bz2}
+$ \textbf{cd netplug-1.2.5}
+$ \textbf{hg init}
+$ \textbf{hg commit -q --addremove --message netplug-1.2.5}
+$ \textbf{cd ..}
+$ \textbf{hg clone netplug-1.2.5 netplug}
+updating working directory
+18 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.tarball.newsource.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,13 @@
+$ \textbf{hg qpop -a}
+patch queue now empty
+$ \textbf{cd ..}
+$ \textbf{download netplug-1.2.8.tar.bz2}
+$ \textbf{hg clone netplug-1.2.5 netplug-1.2.8}
+updating working directory
+18 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cd netplug-1.2.8}
+$ \textbf{hg locate -0 | xargs -0 rm}
+$ \textbf{cd ..}
+$ \textbf{tar jxf netplug-1.2.8.tar.bz2}
+$ \textbf{cd netplug-1.2.8}
+$ \textbf{hg commit --addremove --message netplug-1.2.8}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.tarball.qinit.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,28 @@
+$ \textbf{cd netplug}
+$ \textbf{hg qinit}
+$ \textbf{hg qnew -m 'fix build problem with gcc 4' build-fix.patch}
+$ \textbf{perl -pi -e 's/int addr_len/socklen_t addr_len/' netlink.c}
+$ \textbf{hg qrefresh}
+$ \textbf{hg tip -p}
+changeset:
+tag:         qtip
+tag:         build-fix.patch
+tag:         tip
+tag:         qbase
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     fix build problem with gcc 4
+
+diff -r  -r  netlink.c
+
+
+@@ -275,7 +275,7 @@
+         exit(1);
+     \}
+
+-    int addr_len = sizeof(addr);
++    socklen_t addr_len = sizeof(addr);
+
+     if (getsockname(fd, (struct sockaddr *) &addr, &addr_len) == -1) \{
+         do_log(LOG_ERR, "Could not get socket details: %m");
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.tarball.repush.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,13 @@
+$ \textbf{cd ../netplug}
+$ \textbf{hg pull ../netplug-1.2.8}
+pulling from ../netplug-1.2.8
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 12 changes to 12 files
+(run 'hg update' to get a working copy)
+$ \textbf{hg qpush -a}
+(working directory not at tip)
+applying build-fix.patch
+now at: build-fix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.tools.lsdiff.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,21 @@
+$ \textbf{lsdiff -nvv remove-redundant-null-checks.patch}
+22	File #1  	a/drivers/char/agp/sgi-agp.c
+	24	Hunk #1	static int __devinit agp_sgi_init(void)
+37	File #2  	a/drivers/char/hvcs.c
+	39	Hunk #1	static struct tty_operations hvcs_ops =
+	53	Hunk #2	static int hvcs_alloc_index_list(int n)
+69	File #3  	a/drivers/message/fusion/mptfc.c
+	71	Hunk #1	mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, in
+85	File #4  	a/drivers/message/fusion/mptsas.c
+	87	Hunk #1	mptsas_probe_hba_phys(MPT_ADAPTER *ioc)
+98	File #5  	a/drivers/net/fs_enet/fs_enet-mii.c
+	100	Hunk #1	static struct fs_enet_mii_bus *create_bu
+111	File #6  	a/drivers/net/wireless/ipw2200.c
+	113	Hunk #1	static struct ipw_fw_error *ipw_alloc_er
+	126	Hunk #2	static ssize_t clear_error(struct device
+	140	Hunk #3	static void ipw_irq_tasklet(struct ipw_p
+	150	Hunk #4	static void ipw_pci_remove(struct pci_de
+164	File #7  	a/drivers/scsi/libata-scsi.c
+	166	Hunk #1	int ata_cmd_ioctl(struct scsi_device *sc
+178	File #8  	a/drivers/video/au1100fb.c
+	180	Hunk #1	void __exit au1100fb_cleanup(void)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.tools.tools.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,23 @@
+$ \textbf{diffstat -p1 remove-redundant-null-checks.patch}
+ drivers/char/agp/sgi-agp.c        |    5 ++---
+ drivers/char/hvcs.c               |   11 +++++------
+ drivers/message/fusion/mptfc.c    |    6 ++----
+ drivers/message/fusion/mptsas.c   |    3 +--
+ drivers/net/fs_enet/fs_enet-mii.c |    3 +--
+ drivers/net/wireless/ipw2200.c    |   22 ++++++----------------
+ drivers/scsi/libata-scsi.c        |    4 +---
+ drivers/video/au1100fb.c          |    3 +--
+ 8 files changed, 19 insertions(+), 38 deletions(-)
+$ \textbf{filterdiff -i '*/video/*' remove-redundant-null-checks.patch}
+
+
+@@ -743,8 +743,7 @@ void __exit au1100fb_cleanup(void)
+ \{
+ 	driver_unregister(&au1100fb_driver);
+
+-	if (drv_info.opt_mode)
+-		kfree(drv_info.opt_mode);
++	kfree(drv_info.opt_mode);
+ \}
+
+ module_init(au1100fb_init);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.tutorial.add.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{echo 'file 3, line 1' >> file3}
+$ \textbf{hg qnew add-file3.patch}
+$ \textbf{hg qnew -f add-file3.patch}
+abort: patch "add-file3.patch" already exists
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.tutorial.qinit.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+$ \textbf{hg init mq-sandbox}
+$ \textbf{cd mq-sandbox}
+$ \textbf{echo 'line 1' > file1}
+$ \textbf{echo 'another line 1' > file2}
+$ \textbf{hg add file1 file2}
+$ \textbf{hg commit -m'first change'}
+$ \textbf{hg qinit}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.tutorial.qnew.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,20 @@
+$ \textbf{hg tip}
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     first change
+
+$ \textbf{hg qnew first.patch}
+$ \textbf{hg tip}
+changeset:
+tag:         qtip
+tag:         first.patch
+tag:         tip
+tag:         qbase
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     [mq]: first.patch
+
+$ \textbf{ls .hg/patches}
+first.patch  series  status
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.tutorial.qnew2.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,28 @@
+$ \textbf{hg qnew second.patch}
+$ \textbf{hg log --style=compact --limit=2}
+2[qtip,second.patch,tip]      2009-01-30 06:34 +0000   bos
+  [mq]: second.patch
+
+1[first.patch,qbase]      2009-01-30 06:34 +0000   bos
+  [mq]: first.patch
+
+$ \textbf{echo 'line 4' >> file1}
+$ \textbf{hg qrefresh}
+$ \textbf{hg tip --style=compact --patch}
+2[qtip,second.patch,tip]      2009-01-30 06:34 +0000   bos
+  [mq]: second.patch
+
+diff -r  -r  file1
+
+
+@@ -1,3 +1,4 @@
+ line 1
+ line 2
+ line 3
++line 4
+
+$ \textbf{hg annotate file1}
+0: line 1
+1: line 2
+1: line 3
+2: line 4
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.tutorial.qpop.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,14 @@
+$ \textbf{hg qapplied}
+first.patch
+second.patch
+$ \textbf{hg qpop}
+now at: first.patch
+$ \textbf{hg qseries}
+first.patch
+second.patch
+$ \textbf{hg qapplied}
+first.patch
+$ \textbf{cat file1}
+line 1
+line 2
+line 3
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.tutorial.qpush-a.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,8 @@
+$ \textbf{hg qpush -a}
+applying second.patch
+now at: second.patch
+$ \textbf{cat file1}
+line 1
+line 2
+line 3
+line 4
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.tutorial.qrefresh.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,21 @@
+$ \textbf{echo 'line 2' >> file1}
+$ \textbf{hg diff}
+diff -r  file1
+
+
+@@ -1,1 +1,2 @@
+ line 1
++line 2
+$ \textbf{hg qrefresh}
+$ \textbf{hg diff}
+$ \textbf{hg tip --style=compact --patch}
+1[qtip,first.patch,tip,qbase]      2009-01-30 06:34 +0000   bos
+  [mq]: first.patch
+
+diff -r  -r  file1
+
+
+@@ -1,1 +1,2 @@
+ line 1
++line 2
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.tutorial.qrefresh2.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,16 @@
+$ \textbf{echo 'line 3' >> file1}
+$ \textbf{hg status}
+M file1
+$ \textbf{hg qrefresh}
+$ \textbf{hg tip --style=compact --patch}
+1[qtip,first.patch,tip,qbase]      2009-01-30 06:34 +0000   bos
+  [mq]: first.patch
+
+diff -r  -r  file1
+
+
+@@ -1,1 +1,3 @@
+ line 1
++line 2
++line 3
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/mq.tutorial.qseries.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,6 @@
+$ \textbf{hg qseries}
+first.patch
+second.patch
+$ \textbf{hg qapplied}
+first.patch
+second.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/rename.divergent.clone.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,6 @@
+$ \textbf{hg clone orig anne}
+updating working directory
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{hg clone orig bob}
+updating working directory
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/rename.divergent.merge.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,26 @@
+# See http://www.selenic.com/mercurial/bts/issue455
+$ \textbf{cd ../orig}
+$ \textbf{hg pull -u ../anne}
+pulling from ../anne
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+$ \textbf{hg pull ../bob}
+pulling from ../bob
+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)
+$ \textbf{hg merge}
+warning: detected divergent renames of foo to:
+ bar
+ quux
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+$ \textbf{ls}
+bar  quux
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/rename.divergent.rename.anne.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{cd anne}
+$ \textbf{hg mv foo bar}
+$ \textbf{hg ci -m 'Rename foo to bar'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/rename.divergent.rename.bob.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{cd ../bob}
+$ \textbf{hg mv foo quux}
+$ \textbf{hg ci -m 'Rename foo to quux'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/rollback.add.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{hg add b}
+$ \textbf{hg commit -m 'Add file b, this time for real'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/rollback.commit.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{hg status}
+M a
+$ \textbf{echo b > b}
+$ \textbf{hg commit -m 'Add file b'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/rollback.rollback.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,12 @@
+$ \textbf{hg rollback}
+rolling back last transaction
+$ \textbf{hg tip}
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     First commit
+
+$ \textbf{hg status}
+M a
+? b
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/rollback.status.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,9 @@
+$ \textbf{hg status}
+? b
+$ \textbf{hg tip}
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Add file b
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/rollback.twice.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{hg rollback}
+rolling back last transaction
+$ \textbf{hg rollback}
+no rollback information available
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tag.init.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,5 @@
+$ \textbf{hg init mytag}
+$ \textbf{cd mytag}
+$ \textbf{echo hello > myfile}
+$ \textbf{hg commit -A -m 'Initial commit'}
+adding myfile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tag.log.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,13 @@
+$ \textbf{hg log}
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Added tag v1.0 for changeset
+
+changeset:
+tag:         v1.0
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Initial commit
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tag.log.v1.0.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{echo goodbye > myfile2}
+$ \textbf{hg commit -A -m 'Second commit'}
+adding myfile2
+$ \textbf{hg log -r v1.0}
+changeset:
+tag:         v1.0
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Initial commit
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tag.remove.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{hg tag --remove v1.0}
+$ \textbf{hg tags}
+tip
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tag.replace.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{hg tag -r 1 v1.1}
+$ \textbf{hg tags}
+tip
+v1.1
+$ \textbf{hg tag -r 2 v1.1}
+abort: tag 'v1.1' already exists (use -f to force)
+$ \textbf{hg tag -f -r 2 v1.1}
+$ \textbf{hg tags}
+tip
+v1.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tag.tag.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,1 @@
+$ \textbf{hg tag v1.0}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tag.tags.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{hg tags}
+tip
+v1.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tag.tip.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+$ \textbf{hg tip}
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Added tag v1.1 for changeset
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.simple.changelog.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.simple.combine.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,6 @@
+
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.simple.compact.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.simple.datekeyword.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.simple.keywords.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.simple.manyfilters.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.simple.normal.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.simple.rev.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.simple.simplest.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.simple.simplesub.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.svnstyle.id.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,1 @@
+$ \textbf{hg log -r0 --template '\{node\}'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.svnstyle.result.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,11 @@
+$ \textbf{hg log -r1 --style svn.style}
+------------------------------------------------------------------------
+
+r1 | bos | 2009-01-30 06:40 +0000 (Fri, 30 Jan 2009 06:40:17 +0000)
+
+added line to end of <<hello>> file.
+
+in addition, added a file with the helpful name (at least i hope that some
+might consider it so) of goodbye.
+
+------------------------------------------------------------------------
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.svnstyle.short.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{svn log -r9653}
+------------------------------------------------------------------------
+r9653 | sean.hefty | 2006-09-27 14:39:55 -0700 (Wed, 27 Sep 2006) | 5 lines
+
+On reporting a route error, also include the status for the error,
+rather than indicating a status of 0 when an error has occurred.
+
+Signed-off-by: Sean Hefty <sean.hefty@intel.com>
+
+------------------------------------------------------------------------
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.svnstyle.simplest.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{cat svn.style}
+changeset = "\{node|short\}\textbackslash{}n"
+$ \textbf{hg log -r1 --style svn.style}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.svnstyle.style.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{cat svn.style}
+header = '------------------------------------------------------------------------\textbackslash{}n\textbackslash{}n'
+changeset = svn.template
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.svnstyle.syntax.error.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{hg log -r1 --style broken.style}
+abort: broken.style:1: parse error
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.svnstyle.syntax.input.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{cat broken.style}
+changeset =
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/template.svnstyle.template.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,6 @@
+$ \textbf{cat svn.template}
+r\{rev\} | \{author|user\} | \{date|isodate\} (\{date|rfc822date\})
+
+\{desc|strip|fill76\}
+
+------------------------------------------------------------------------
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour-merge-conflict.commit.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,16 @@
+$ \textbf{cat > letter.txt <<EOF}
+> \textbf{Greetings!}
+> \textbf{I am Bryan O'Sullivan, no relation of the former}
+> \textbf{Nigerian dictator Sani Abacha.}
+> \textbf{EOF}
+$ \textbf{hg resolve -m letter.txt}
+$ \textbf{hg commit -m 'Send me your money'}
+$ \textbf{hg tip}
+changeset:
+tag:         tip
+parent:
+parent:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Send me your money
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour-merge-conflict.cousin.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,11 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone scam scam-cousin}
+updating working directory
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cd scam-cousin}
+$ \textbf{cat > letter.txt <<EOF}
+> \textbf{Greetings!}
+> \textbf{I am Shehu Musa Abacha, cousin to the former}
+> \textbf{Nigerian dictator Sani Abacha.}
+> \textbf{EOF}
+$ \textbf{hg commit -m '419 scam, with cousin'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour-merge-conflict.merge.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,17 @@
+$ \textbf{export HGMERGE=merge}
+$ \textbf{echo 'XXX this is broken and must be fixed'}
+XXX this is broken and must be fixed
+$ \textbf{hg merge}
+merging letter.txt
+merge: warning: conflicts during merge
+merging letter.txt failed!
+0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+use 'hg resolve' to retry unresolved file merges
+$ \textbf{cat letter.txt}
+Greetings!
+
+I am Shehu Musa Abacha, cousin to the former
+=======
+I am Alhaji Abba Abacha, son of the former
+
+Nigerian dictator Sani Abacha.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour-merge-conflict.pull.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,14 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone scam-cousin scam-merge}
+updating working directory
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cd scam-merge}
+$ \textbf{hg pull -u ../scam-son}
+pulling from ../scam-son
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files (+1 heads)
+not updating, since new heads added
+(run 'hg heads' to see heads, 'hg merge' to merge)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour-merge-conflict.son.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,11 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone scam scam-son}
+updating working directory
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cd scam-son}
+$ \textbf{cat > letter.txt <<EOF}
+> \textbf{Greetings!}
+> \textbf{I am Alhaji Abba Abacha, son of the former}
+> \textbf{Nigerian dictator Sani Abacha.}
+> \textbf{EOF}
+$ \textbf{hg commit -m '419 scam, with son'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour-merge-conflict.wife.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+$ \textbf{cat > letter.txt <<EOF}
+> \textbf{Greetings!}
+> \textbf{I am Mariam Abacha, the wife of former}
+> \textbf{Nigerian dictator Sani Abacha.}
+> \textbf{EOF}
+$ \textbf{hg add letter.txt}
+$ \textbf{hg commit -m '419 scam, first draft'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.clone-pull.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone hello hello-pull}
+updating working directory
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.clone-push.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone hello hello-push}
+updating working directory
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.clone.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,9 @@
+$ \textbf{hg clone http://hg.serpentine.com/tutorial/hello}
+destination directory: hello
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 5 changesets with 5 changes to 2 files
+updating working directory
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.commit.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,1 @@
+$ \textbf{hg commit}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.diff.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,11 @@
+$ \textbf{hg diff}
+diff -r  hello.c
+
+
+@@ -8,5 +8,6 @@
+ int main(int argc, char **argv)
+ \{
+ 	printf("hello, world!\textbackslash{}");
++	printf("hello again!\textbackslash{}n");
+ 	return 0;
+ \}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.help.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,19 @@
+$ \textbf{hg help init}
+hg init [-e CMD] [--remotecmd CMD] [DEST]
+
+create a new repository in the given directory
+
+    Initialize a new repository in the given directory. If the given
+    directory does not exist, it is created.
+
+    If no directory is given, the current directory is used.
+
+    It is possible to specify an ssh:// URL as the destination.
+    See 'hg help urls' for more information.
+
+options:
+
+ -e --ssh        specify ssh command to use
+    --remotecmd  specify hg command to run on the remote side
+
+use "hg -v help init" to show global options
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.incoming.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{cd hello-pull}
+$ \textbf{hg incoming ../my-hello}
+comparing with ../my-hello
+searching for changes
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Added an extra line of output
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.log-r.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,24 @@
+$ \textbf{hg log -r 3}
+changeset:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Get make to generate the final binary from a .o file.
+
+$ \textbf{hg log -r }
+changeset:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Get make to generate the final binary from a .o file.
+
+$ \textbf{hg log -r 1 -r 4}
+changeset:
+user:        mpm@selenic.com
+
+summary:     Create a makefile
+
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Trim comments.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.log-v.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,9 @@
+$ \textbf{hg log -v -r 3}
+changeset:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+files:       Makefile
+description:
+Get make to generate the final binary from a .o file.
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.log-vp.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,21 @@
+$ \textbf{hg log -v -p -r 2}
+changeset:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+files:       hello.c
+description:
+Introduce a typo into hello.c.
+
+
+diff -r  -r  hello.c
+
+
+@@ -11,6 +11,6 @@
+
+ int main(int argc, char **argv)
+ \{
+-	printf("hello, world!\textbackslash{}n");
++	printf("hello, world!\textbackslash{}");
+ 	return 0;
+ \}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.log.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,27 @@
+$ \textbf{hg log}
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Trim comments.
+
+changeset:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Get make to generate the final binary from a .o file.
+
+changeset:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Introduce a typo into hello.c.
+
+changeset:
+user:        mpm@selenic.com
+
+summary:     Create a makefile
+
+changeset:
+user:        mpm@selenic.com
+
+summary:     Create a standard "hello, world" program
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.log.range.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,17 @@
+$ \textbf{hg log -r 2:4}
+changeset:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Introduce a typo into hello.c.
+
+changeset:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Get make to generate the final binary from a .o file.
+
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Trim comments.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.ls-a.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,3 @@
+$ \textbf{cd hello}
+$ \textbf{ls -a}
+.  ..  .hg  Makefile  hello.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.ls.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,5 @@
+$ \textbf{ls -l}
+
+
+$ \textbf{ls hello}
+Makefile  hello.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.merge.cat.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,28 @@
+$ \textbf{cat hello.c}
+/*
+ * Placed in the public domain by Bryan O'Sullivan.  This program is
+ * not covered by patents in the United States or other countries.
+ */
+
+#include <stdio.h>
+
+int main(int argc, char **argv)
+\{
+	printf("once more, hello.\textbackslash{}n");
+	printf("hello, world!\textbackslash{}");
+	return 0;
+\}
+$ \textbf{cat ../my-hello/hello.c}
+/*
+ * Placed in the public domain by Bryan O'Sullivan.  This program is
+ * not covered by patents in the United States or other countries.
+ */
+
+#include <stdio.h>
+
+int main(int argc, char **argv)
+\{
+	printf("hello, world!\textbackslash{}");
+	printf("hello again!\textbackslash{}n");
+	return 0;
+\}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.merge.clone.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone hello my-new-hello}
+updating working directory
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cd my-new-hello}
+$ \textbf{sed -i '/printf/i\textbackslash{}\textbackslash{}tprintf("once more, hello.\textbackslash{}\textbackslash{}n");' hello.c}
+$ \textbf{hg commit -m 'A new hello for a new day.'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.merge.commit.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,1 @@
+$ \textbf{hg commit -m 'Merged changes'}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.merge.heads.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,13 @@
+$ \textbf{hg heads}
+changeset:
+tag:         tip
+parent:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Added an extra line of output
+
+changeset:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     A new hello for a new day.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.merge.merge.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{hg merge}
+merging hello.c
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.merge.parents.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,28 @@
+$ \textbf{hg parents}
+changeset:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     A new hello for a new day.
+
+changeset:
+tag:         tip
+parent:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Added an extra line of output
+
+$ \textbf{cat hello.c}
+/*
+ * Placed in the public domain by Bryan O'Sullivan.  This program is
+ * not covered by patents in the United States or other countries.
+ */
+
+#include <stdio.h>
+
+int main(int argc, char **argv)
+\{
+	printf("once more, hello.\textbackslash{}n");
+	printf("hello, world!\textbackslash{}");
+	printf("hello again!\textbackslash{}n");
+	return 0;
+\}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.merge.pull.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,8 @@
+$ \textbf{hg pull ../my-hello}
+pulling from ../my-hello
+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)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.merge.tip.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,9 @@
+$ \textbf{hg tip}
+changeset:
+tag:         tip
+parent:
+parent:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Merged changes
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.merge.update.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,2 @@
+$ \textbf{hg update}
+abort: crosses branches (use 'hg merge' or 'hg update -C')
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.older.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{hg update 2}
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{hg parents}
+changeset:
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Introduce a typo into hello.c.
+
+$ \textbf{hg update}
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.outgoing.net.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,9 @@
+$ \textbf{hg outgoing http://hg.serpentine.com/tutorial/hello}
+comparing with http://hg.serpentine.com/tutorial/hello
+searching for changes
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Added an extra line of output
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.outgoing.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,10 @@
+$ \textbf{cd my-hello}
+$ \textbf{hg outgoing ../hello-push}
+comparing with ../hello-push
+searching for changes
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Added an extra line of output
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.parents.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+$ \textbf{hg parents}
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Added an extra line of output
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.pull.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,22 @@
+$ \textbf{hg tip}
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Trim comments.
+
+$ \textbf{hg pull ../my-hello}
+pulling from ../my-hello
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+(run 'hg update' to get a working copy)
+$ \textbf{hg tip}
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+summary:     Added an extra line of output
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.push.net.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{hg push http://hg.serpentine.com/tutorial/hello}
+pushing to http://hg.serpentine.com/tutorial/hello
+searching for changes
+ssl required
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.push.nothing.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{hg push ../hello-push}
+pushing to ../hello-push
+searching for changes
+no changes found
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.push.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+$ \textbf{hg push ../hello-push}
+pushing to ../hello-push
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.reclone.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,5 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone hello my-hello}
+updating working directory
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cd my-hello}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.sed.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,1 @@
+$ \textbf{sed -i '/printf/a\textbackslash{}\textbackslash{}tprintf("hello again!\textbackslash{}\textbackslash{}n");' hello.c}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.status.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,4 @@
+$ \textbf{ls}
+Makefile  hello.c
+$ \textbf{hg status}
+M hello.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.tip.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,21 @@
+$ \textbf{hg tip -vp}
+changeset:
+tag:         tip
+user:        Bryan O'Sullivan <bos@serpentine.com>
+
+files:       hello.c
+description:
+Added an extra line of output
+
+
+diff -r  -r  hello.c
+
+
+@@ -8,5 +8,6 @@
+ int main(int argc, char **argv)
+ \{
+ 	printf("hello, world!\textbackslash{}");
++	printf("hello again!\textbackslash{}n");
+ 	return 0;
+ \}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.update.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,7 @@
+$ \textbf{grep printf hello.c}
+	printf("hello, world!\textbackslash{}");
+$ \textbf{hg update tip}
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{grep printf hello.c}
+	printf("hello, world!\textbackslash{}");
+	printf("hello again!\textbackslash{}n");
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour.version.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,6 @@
+$ \textbf{hg version}
+Mercurial Distributed SCM (version )
+
+Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/en/examples/rollback.add.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{hg add b}
-$ \textbf{hg commit -m 'Add file b, this time for real'}
--- a/en/examples/rollback.commit.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{hg status}
-M a
-$ \textbf{echo b > b}
-$ \textbf{hg commit -m 'Add file b'}
--- a/en/examples/rollback.rollback.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$ \textbf{hg rollback}
-rolling back last transaction
-$ \textbf{hg tip}
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     First commit
-
-$ \textbf{hg status}
-M a
-? b
--- a/en/examples/rollback.status.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$ \textbf{hg status}
-? b
-$ \textbf{hg tip}
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Add file b
-
--- a/en/examples/rollback.twice.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{hg rollback}
-rolling back last transaction
-$ \textbf{hg rollback}
-no rollback information available
--- a/en/examples/tag.init.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$ \textbf{hg init mytag}
-$ \textbf{cd mytag}
-$ \textbf{echo hello > myfile}
-$ \textbf{hg commit -A -m 'Initial commit'}
-adding myfile
--- a/en/examples/tag.log.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$ \textbf{hg log}
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Added tag v1.0 for changeset
-
-changeset:
-tag:         v1.0
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Initial commit
-
--- a/en/examples/tag.log.v1.0.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{echo goodbye > myfile2}
-$ \textbf{hg commit -A -m 'Second commit'}
-adding myfile2
-$ \textbf{hg log -r v1.0}
-changeset:
-tag:         v1.0
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Initial commit
-
--- a/en/examples/tag.remove.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{hg tag --remove v1.0}
-$ \textbf{hg tags}
-tip
--- a/en/examples/tag.replace.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{hg tag -r 1 v1.1}
-$ \textbf{hg tags}
-tip
-v1.1
-$ \textbf{hg tag -r 2 v1.1}
-abort: tag 'v1.1' already exists (use -f to force)
-$ \textbf{hg tag -f -r 2 v1.1}
-$ \textbf{hg tags}
-tip
-v1.1
--- a/en/examples/tag.tag.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-$ \textbf{hg tag v1.0}
--- a/en/examples/tag.tags.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{hg tags}
-tip
-v1.0
--- a/en/examples/tag.tip.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$ \textbf{hg tip}
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Added tag v1.1 for changeset
-
--- a/en/examples/template.simple.changelog.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/en/examples/template.simple.combine.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-
-
-
-
-
-
--- a/en/examples/template.simple.compact.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/en/examples/template.simple.datekeyword.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-
-
-
-
--- a/en/examples/template.simple.keywords.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/en/examples/template.simple.manyfilters.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/en/examples/template.simple.normal.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
--- a/en/examples/template.simple.rev.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-
-
-
--- a/en/examples/template.simple.simplest.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-
-
--- a/en/examples/template.simple.simplesub.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
--- a/en/examples/template.svnstyle.id.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-$ \textbf{hg log -r0 --template '\{node\}'}
--- a/en/examples/template.svnstyle.result.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$ \textbf{hg log -r1 --style svn.style}
-------------------------------------------------------------------------
-
-r1 | bos | 2009-01-30 06:40 +0000 (Fri, 30 Jan 2009 06:40:17 +0000)
-
-added line to end of <<hello>> file.
-
-in addition, added a file with the helpful name (at least i hope that some
-might consider it so) of goodbye.
-
-------------------------------------------------------------------------
--- a/en/examples/template.svnstyle.short.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{svn log -r9653}
-------------------------------------------------------------------------
-r9653 | sean.hefty | 2006-09-27 14:39:55 -0700 (Wed, 27 Sep 2006) | 5 lines
-
-On reporting a route error, also include the status for the error,
-rather than indicating a status of 0 when an error has occurred.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-------------------------------------------------------------------------
--- a/en/examples/template.svnstyle.simplest.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{cat svn.style}
-changeset = "\{node|short\}\textbackslash{}n"
-$ \textbf{hg log -r1 --style svn.style}
-
--- a/en/examples/template.svnstyle.style.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{cat svn.style}
-header = '------------------------------------------------------------------------\textbackslash{}n\textbackslash{}n'
-changeset = svn.template
--- a/en/examples/template.svnstyle.syntax.error.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{hg log -r1 --style broken.style}
-abort: broken.style:1: parse error
--- a/en/examples/template.svnstyle.syntax.input.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{cat broken.style}
-changeset =
--- a/en/examples/template.svnstyle.template.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$ \textbf{cat svn.template}
-r\{rev\} | \{author|user\} | \{date|isodate\} (\{date|rfc822date\})
-
-\{desc|strip|fill76\}
-
-------------------------------------------------------------------------
--- a/en/examples/tour-merge-conflict.commit.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$ \textbf{cat > letter.txt <<EOF}
-> \textbf{Greetings!}
-> \textbf{I am Bryan O'Sullivan, no relation of the former}
-> \textbf{Nigerian dictator Sani Abacha.}
-> \textbf{EOF}
-$ \textbf{hg resolve -m letter.txt}
-$ \textbf{hg commit -m 'Send me your money'}
-$ \textbf{hg tip}
-changeset:
-tag:         tip
-parent:
-parent:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Send me your money
-
--- a/en/examples/tour-merge-conflict.cousin.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone scam scam-cousin}
-updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd scam-cousin}
-$ \textbf{cat > letter.txt <<EOF}
-> \textbf{Greetings!}
-> \textbf{I am Shehu Musa Abacha, cousin to the former}
-> \textbf{Nigerian dictator Sani Abacha.}
-> \textbf{EOF}
-$ \textbf{hg commit -m '419 scam, with cousin'}
--- a/en/examples/tour-merge-conflict.merge.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$ \textbf{export HGMERGE=merge}
-$ \textbf{echo 'XXX this is broken and must be fixed'}
-XXX this is broken and must be fixed
-$ \textbf{hg merge}
-merging letter.txt
-merge: warning: conflicts during merge
-merging letter.txt failed!
-0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
-$ \textbf{cat letter.txt}
-Greetings!
-
-I am Shehu Musa Abacha, cousin to the former
-=======
-I am Alhaji Abba Abacha, son of the former
-
-Nigerian dictator Sani Abacha.
--- a/en/examples/tour-merge-conflict.pull.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone scam-cousin scam-merge}
-updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd scam-merge}
-$ \textbf{hg pull -u ../scam-son}
-pulling from ../scam-son
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files (+1 heads)
-not updating, since new heads added
-(run 'hg heads' to see heads, 'hg merge' to merge)
--- a/en/examples/tour-merge-conflict.son.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone scam scam-son}
-updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd scam-son}
-$ \textbf{cat > letter.txt <<EOF}
-> \textbf{Greetings!}
-> \textbf{I am Alhaji Abba Abacha, son of the former}
-> \textbf{Nigerian dictator Sani Abacha.}
-> \textbf{EOF}
-$ \textbf{hg commit -m '419 scam, with son'}
--- a/en/examples/tour-merge-conflict.wife.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$ \textbf{cat > letter.txt <<EOF}
-> \textbf{Greetings!}
-> \textbf{I am Mariam Abacha, the wife of former}
-> \textbf{Nigerian dictator Sani Abacha.}
-> \textbf{EOF}
-$ \textbf{hg add letter.txt}
-$ \textbf{hg commit -m '419 scam, first draft'}
--- a/en/examples/tour.clone-pull.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone hello hello-pull}
-updating working directory
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/tour.clone-push.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone hello hello-push}
-updating working directory
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/tour.clone.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$ \textbf{hg clone http://hg.serpentine.com/tutorial/hello}
-destination directory: hello
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 5 changesets with 5 changes to 2 files
-updating working directory
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/tour.commit.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-$ \textbf{hg commit}
--- a/en/examples/tour.diff.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$ \textbf{hg diff}
-diff -r  hello.c
-
-
-@@ -8,5 +8,6 @@
- int main(int argc, char **argv)
- \{
- 	printf("hello, world!\textbackslash{}");
-+	printf("hello again!\textbackslash{}n");
- 	return 0;
- \}
--- a/en/examples/tour.help.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$ \textbf{hg help init}
-hg init [-e CMD] [--remotecmd CMD] [DEST]
-
-create a new repository in the given directory
-
-    Initialize a new repository in the given directory. If the given
-    directory does not exist, it is created.
-
-    If no directory is given, the current directory is used.
-
-    It is possible to specify an ssh:// URL as the destination.
-    See 'hg help urls' for more information.
-
-options:
-
- -e --ssh        specify ssh command to use
-    --remotecmd  specify hg command to run on the remote side
-
-use "hg -v help init" to show global options
--- a/en/examples/tour.incoming.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{cd hello-pull}
-$ \textbf{hg incoming ../my-hello}
-comparing with ../my-hello
-searching for changes
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Added an extra line of output
-
--- a/en/examples/tour.log-r.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$ \textbf{hg log -r 3}
-changeset:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Get make to generate the final binary from a .o file.
-
-$ \textbf{hg log -r }
-changeset:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Get make to generate the final binary from a .o file.
-
-$ \textbf{hg log -r 1 -r 4}
-changeset:
-user:        mpm@selenic.com
-
-summary:     Create a makefile
-
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Trim comments.
-
--- a/en/examples/tour.log-v.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$ \textbf{hg log -v -r 3}
-changeset:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-files:       Makefile
-description:
-Get make to generate the final binary from a .o file.
-
-
--- a/en/examples/tour.log-vp.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$ \textbf{hg log -v -p -r 2}
-changeset:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-files:       hello.c
-description:
-Introduce a typo into hello.c.
-
-
-diff -r  -r  hello.c
-
-
-@@ -11,6 +11,6 @@
-
- int main(int argc, char **argv)
- \{
--	printf("hello, world!\textbackslash{}n");
-+	printf("hello, world!\textbackslash{}");
- 	return 0;
- \}
-
--- a/en/examples/tour.log.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$ \textbf{hg log}
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Trim comments.
-
-changeset:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Get make to generate the final binary from a .o file.
-
-changeset:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Introduce a typo into hello.c.
-
-changeset:
-user:        mpm@selenic.com
-
-summary:     Create a makefile
-
-changeset:
-user:        mpm@selenic.com
-
-summary:     Create a standard "hello, world" program
-
--- a/en/examples/tour.log.range.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$ \textbf{hg log -r 2:4}
-changeset:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Introduce a typo into hello.c.
-
-changeset:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Get make to generate the final binary from a .o file.
-
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Trim comments.
-
--- a/en/examples/tour.ls-a.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$ \textbf{cd hello}
-$ \textbf{ls -a}
-.  ..  .hg  Makefile  hello.c
--- a/en/examples/tour.ls.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$ \textbf{ls -l}
-
-
-$ \textbf{ls hello}
-Makefile  hello.c
--- a/en/examples/tour.merge.cat.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$ \textbf{cat hello.c}
-/*
- * Placed in the public domain by Bryan O'Sullivan.  This program is
- * not covered by patents in the United States or other countries.
- */
-
-#include <stdio.h>
-
-int main(int argc, char **argv)
-\{
-	printf("once more, hello.\textbackslash{}n");
-	printf("hello, world!\textbackslash{}");
-	return 0;
-\}
-$ \textbf{cat ../my-hello/hello.c}
-/*
- * Placed in the public domain by Bryan O'Sullivan.  This program is
- * not covered by patents in the United States or other countries.
- */
-
-#include <stdio.h>
-
-int main(int argc, char **argv)
-\{
-	printf("hello, world!\textbackslash{}");
-	printf("hello again!\textbackslash{}n");
-	return 0;
-\}
--- a/en/examples/tour.merge.clone.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone hello my-new-hello}
-updating working directory
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd my-new-hello}
-$ \textbf{sed -i '/printf/i\textbackslash{}\textbackslash{}tprintf("once more, hello.\textbackslash{}\textbackslash{}n");' hello.c}
-$ \textbf{hg commit -m 'A new hello for a new day.'}
--- a/en/examples/tour.merge.commit.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-$ \textbf{hg commit -m 'Merged changes'}
--- a/en/examples/tour.merge.heads.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$ \textbf{hg heads}
-changeset:
-tag:         tip
-parent:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Added an extra line of output
-
-changeset:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     A new hello for a new day.
-
--- a/en/examples/tour.merge.merge.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{hg merge}
-merging hello.c
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
--- a/en/examples/tour.merge.parents.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$ \textbf{hg parents}
-changeset:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     A new hello for a new day.
-
-changeset:
-tag:         tip
-parent:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Added an extra line of output
-
-$ \textbf{cat hello.c}
-/*
- * Placed in the public domain by Bryan O'Sullivan.  This program is
- * not covered by patents in the United States or other countries.
- */
-
-#include <stdio.h>
-
-int main(int argc, char **argv)
-\{
-	printf("once more, hello.\textbackslash{}n");
-	printf("hello, world!\textbackslash{}");
-	printf("hello again!\textbackslash{}n");
-	return 0;
-\}
--- a/en/examples/tour.merge.pull.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$ \textbf{hg pull ../my-hello}
-pulling from ../my-hello
-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)
--- a/en/examples/tour.merge.tip.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$ \textbf{hg tip}
-changeset:
-tag:         tip
-parent:
-parent:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Merged changes
-
--- a/en/examples/tour.merge.update.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$ \textbf{hg update}
-abort: crosses branches (use 'hg merge' or 'hg update -C')
--- a/en/examples/tour.older.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{hg update 2}
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{hg parents}
-changeset:
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Introduce a typo into hello.c.
-
-$ \textbf{hg update}
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/tour.outgoing.net.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$ \textbf{hg outgoing http://hg.serpentine.com/tutorial/hello}
-comparing with http://hg.serpentine.com/tutorial/hello
-searching for changes
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Added an extra line of output
-
--- a/en/examples/tour.outgoing.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$ \textbf{cd my-hello}
-$ \textbf{hg outgoing ../hello-push}
-comparing with ../hello-push
-searching for changes
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Added an extra line of output
-
--- a/en/examples/tour.parents.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$ \textbf{hg parents}
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Added an extra line of output
-
--- a/en/examples/tour.pull.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$ \textbf{hg tip}
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Trim comments.
-
-$ \textbf{hg pull ../my-hello}
-pulling from ../my-hello
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
-(run 'hg update' to get a working copy)
-$ \textbf{hg tip}
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-summary:     Added an extra line of output
-
--- a/en/examples/tour.push.net.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{hg push http://hg.serpentine.com/tutorial/hello}
-pushing to http://hg.serpentine.com/tutorial/hello
-searching for changes
-ssl required
--- a/en/examples/tour.push.nothing.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{hg push ../hello-push}
-pushing to ../hello-push
-searching for changes
-no changes found
--- a/en/examples/tour.push.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$ \textbf{hg push ../hello-push}
-pushing to ../hello-push
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
--- a/en/examples/tour.reclone.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone hello my-hello}
-updating working directory
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd my-hello}
--- a/en/examples/tour.sed.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-$ \textbf{sed -i '/printf/a\textbackslash{}\textbackslash{}tprintf("hello again!\textbackslash{}\textbackslash{}n");' hello.c}
--- a/en/examples/tour.status.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-$ \textbf{ls}
-Makefile  hello.c
-$ \textbf{hg status}
-M hello.c
--- a/en/examples/tour.tip.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$ \textbf{hg tip -vp}
-changeset:
-tag:         tip
-user:        Bryan O'Sullivan <bos@serpentine.com>
-
-files:       hello.c
-description:
-Added an extra line of output
-
-
-diff -r  -r  hello.c
-
-
-@@ -8,5 +8,6 @@
- int main(int argc, char **argv)
- \{
- 	printf("hello, world!\textbackslash{}");
-+	printf("hello again!\textbackslash{}n");
- 	return 0;
- \}
-
--- a/en/examples/tour.update.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$ \textbf{grep printf hello.c}
-	printf("hello, world!\textbackslash{}");
-$ \textbf{hg update tip}
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{grep printf hello.c}
-	printf("hello, world!\textbackslash{}");
-	printf("hello again!\textbackslash{}n");
--- a/en/examples/tour.version.out	Mon Mar 09 21:13:56 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$ \textbf{hg version}
-Mercurial Distributed SCM (version )
-
-Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.