Commits

Bryan O'Sullivan  committed 4432ad3

Check in example outputs with begin/end markers.

  • Participants
  • Parent commits c82ff69

Comments (0)

Files changed (214)

File en/examples/results/backout.init.out

+<!-- BEGIN backout.init -->
 <screen><prompt>$</prompt> <userinput>hg init myrepo</userinput>
 <prompt>$</prompt> <userinput>cd myrepo</userinput>
 <prompt>$</prompt> <userinput>echo first change &gt;&gt; myfile</userinput>
 <prompt>$</prompt> <userinput>echo second change &gt;&gt; myfile</userinput>
 <prompt>$</prompt> <userinput>hg commit -m 'second change'</userinput>
 </screen>
+<!-- END backout.init -->

File en/examples/results/backout.manual.backout.out

+<!-- BEGIN backout.manual.backout -->
 <screen><prompt>$</prompt> <userinput>echo third change &gt;&gt; myfile</userinput>
 <prompt>$</prompt> <userinput>hg commit -m 'third change'</userinput>
 <prompt>$</prompt> <userinput>hg backout -m 'back out second change' 1</userinput>
 the backout changeset is a new head - do not forget to merge
 (use "backout --merge" if you want to auto-merge)
 </screen>
+<!-- END backout.manual.backout -->

File en/examples/results/backout.manual.cat.out

+<!-- BEGIN backout.manual.cat -->
 <screen><prompt>$</prompt> <userinput>cat myfile</userinput>
 first change
 second change
 third change
 </screen>
+<!-- END backout.manual.cat -->

File en/examples/results/backout.manual.clone.out

+<!-- BEGIN backout.manual.clone -->
 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
 <prompt>$</prompt> <userinput>hg clone -r1 myrepo newrepo</userinput>
 requesting all changes
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 <prompt>$</prompt> <userinput>cd newrepo</userinput>
 </screen>
+<!-- END backout.manual.clone -->

File en/examples/results/backout.manual.heads.out

+<!-- BEGIN backout.manual.heads -->
 <screen><prompt>$</prompt> <userinput>hg heads</userinput>
 changeset:   
 tag:         tip
 summary:     third change
 
 </screen>
+<!-- END backout.manual.heads -->

File en/examples/results/backout.manual.log.out

+<!-- BEGIN backout.manual.log -->
 <screen><prompt>$</prompt> <userinput>hg log --style compact</userinput>
-3[tip]:1      2009-03-10 04:37 +0000   bos
+3[tip]:1      2009-03-31 19:08 +0000   bos
   back out second change
 
-2      2009-03-10 04:37 +0000   bos
+2      2009-03-31 19:08 +0000   bos
   third change
 
-1      2009-03-10 04:37 +0000   bos
+1      2009-03-31 19:08 +0000   bos
   second change
 
-0      2009-03-10 04:37 +0000   bos
+0      2009-03-31 19:08 +0000   bos
   first change
 
 </screen>
+<!-- END backout.manual.log -->

File en/examples/results/backout.manual.merge.out

+<!-- BEGIN backout.manual.merge -->
 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
 merging myfile
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 first change
 third change
 </screen>
+<!-- END backout.manual.merge -->

File en/examples/results/backout.manual.parents.out

+<!-- BEGIN backout.manual.parents -->
 <screen><prompt>$</prompt> <userinput>hg parents</userinput>
 changeset:   
 user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 summary:     third change
 
 </screen>
+<!-- END backout.manual.parents -->

File en/examples/results/backout.non-tip.backout.out

+<!-- BEGIN backout.non-tip.backout -->
 <screen><prompt>$</prompt> <userinput>echo third change &gt;&gt; myfile</userinput>
 <prompt>$</prompt> <userinput>hg commit -m 'third change'</userinput>
 <prompt>$</prompt> <userinput>hg backout --merge -m 'back out second change' 1</userinput>
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 </screen>
+<!-- END backout.non-tip.backout -->

File en/examples/results/backout.non-tip.cat.out

+<!-- BEGIN backout.non-tip.cat -->
 <screen><prompt>$</prompt> <userinput>cat myfile</userinput>
 first change
 third change
 </screen>
+<!-- END backout.non-tip.cat -->

File en/examples/results/backout.non-tip.clone.out

+<!-- BEGIN backout.non-tip.clone -->
 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
 <prompt>$</prompt> <userinput>hg clone -r1 myrepo non-tip-repo</userinput>
 requesting all changes
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 <prompt>$</prompt> <userinput>cd non-tip-repo</userinput>
 </screen>
+<!-- END backout.non-tip.clone -->

File en/examples/results/backout.simple.log.out

+<!-- BEGIN backout.simple.log -->
 <screen><prompt>$</prompt> <userinput>hg log --style compact</userinput>
-2[tip]      2009-03-10 04:37 +0000   bos
+2[tip]      2009-03-31 19:08 +0000   bos
   back out second change
 
-1      2009-03-10 04:37 +0000   bos
+1      2009-03-31 19:08 +0000   bos
   second change
 
-0      2009-03-10 04:37 +0000   bos
+0      2009-03-31 19:08 +0000   bos
   first change
 
 </screen>
+<!-- END backout.simple.log -->

File en/examples/results/backout.simple.out

+<!-- BEGIN backout.simple -->
 <screen><prompt>$</prompt> <userinput>hg backout -m 'back out second change' tip</userinput>
 reverting myfile
 changeset  backs out changeset 
 <prompt>$</prompt> <userinput>cat myfile</userinput>
 first change
 </screen>
+<!-- END backout.simple -->

File en/examples/results/bisect.commits.out

 
 
 
+
+

File en/examples/results/bisect.help.out

 
 
 
+
+

File en/examples/results/bisect.init.out

 
 
 
+
+

File en/examples/results/bisect.search.bad-init.out

 
 
 
+
+

File en/examples/results/bisect.search.good-init.out

 
 
 
+
+

File en/examples/results/bisect.search.init.out

 
 
 
+
+

File en/examples/results/bisect.search.mytest.out

 
 
 
+
+

File en/examples/results/bisect.search.reset.out

 
 
 
+
+

File en/examples/results/bisect.search.rest.out

 
 
 
+
+

File en/examples/results/bisect.search.step1.out

 
 
 
+
+

File en/examples/results/bisect.search.step2.out

 
 
 
+
+

File en/examples/results/branch-named.branch.out

+<!-- BEGIN branch-named.branch -->
 <screen><prompt>$</prompt> <userinput>hg branch</userinput>
 default
 </screen>
+<!-- END branch-named.branch -->

File en/examples/results/branch-named.branches.out

+<!-- BEGIN branch-named.branches -->
 <screen><prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 tag:         tip
 <prompt>$</prompt> <userinput>hg branches</userinput>
 default                        
 </screen>
+<!-- END branch-named.branches -->

File en/examples/results/branch-named.commit.out

+<!-- BEGIN branch-named.commit -->
 <screen><prompt>$</prompt> <userinput>echo 'hello again' &gt;&gt; myfile</userinput>
 <prompt>$</prompt> <userinput>hg commit -m 'Second commit'</userinput>
 <prompt>$</prompt> <userinput>hg tip</userinput>
 summary:     Second commit
 
 </screen>
+<!-- END branch-named.commit -->

File en/examples/results/branch-named.create.out

+<!-- BEGIN branch-named.create -->
 <screen><prompt>$</prompt> <userinput>hg branch foo</userinput>
 marked working directory as branch foo
 <prompt>$</prompt> <userinput>hg branch</userinput>
 foo
 </screen>
+<!-- END branch-named.create -->

File en/examples/results/branch-named.foo-commit.out

+<!-- BEGIN branch-named.foo-commit -->
 <screen><prompt>$</prompt> <userinput>echo something &gt; somefile</userinput>
 <prompt>$</prompt> <userinput>hg commit -A -m 'New file'</userinput>
 adding somefile
 summary:     Third commit
 
 </screen>
+<!-- END branch-named.foo-commit -->

File en/examples/results/branch-named.merge.out

+<!-- BEGIN branch-named.merge -->
 <screen><prompt>$</prompt> <userinput>hg branch</userinput>
 bar
 <prompt>$</prompt> <userinput>hg merge foo</userinput>
 summary:     Merge
 
 </screen>
+<!-- END branch-named.merge -->

File en/examples/results/branch-named.parents.out

+<!-- BEGIN branch-named.parents -->
 <screen><prompt>$</prompt> <userinput>hg parents</userinput>
 changeset:   
 branch:      bar
 foo                             (inactive)
 default                         (inactive)
 </screen>
+<!-- END branch-named.parents -->

File en/examples/results/branch-named.rebranch.out

+<!-- BEGIN branch-named.rebranch -->
 <screen><prompt>$</prompt> <userinput>hg branch</userinput>
 foo
 <prompt>$</prompt> <userinput>hg branch bar</userinput>
 summary:     Third commit
 
 </screen>
+<!-- END branch-named.rebranch -->

File en/examples/results/branch-named.status.out

+<!-- BEGIN branch-named.status -->
 <screen><prompt>$</prompt> <userinput>hg status</userinput>
 <prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 summary:     Initial commit
 
 </screen>
+<!-- END branch-named.status -->

File en/examples/results/branch-named.update-bar.out

+<!-- BEGIN branch-named.update-bar -->
 <screen><prompt>$</prompt> <userinput>hg update bar</userinput>
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 </screen>
+<!-- END branch-named.update-bar -->

File en/examples/results/branch-named.update-nothing.out

+<!-- BEGIN branch-named.update-nothing -->
 <screen><prompt>$</prompt> <userinput>hg update foo</userinput>
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 <prompt>$</prompt> <userinput>hg update</userinput>
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 </screen>
+<!-- END branch-named.update-nothing -->

File en/examples/results/branch-named.update-switchy.out

+<!-- BEGIN branch-named.update-switchy -->
 <screen><prompt>$</prompt> <userinput>hg update foo</userinput>
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 <prompt>$</prompt> <userinput>hg parents</userinput>
 summary:     Third commit
 
 </screen>
+<!-- END branch-named.update-switchy -->

File en/examples/results/branch-repo.bugfix.out

+<!-- BEGIN branch-repo.bugfix -->
 <screen><prompt>$</prompt> <userinput>hg clone myproject-1.0.1 my-1.0.1-bugfix</userinput>
 updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding file changes
 added 1 changesets with 1 changes to 1 files
 </screen>
+<!-- END branch-repo.bugfix -->

File en/examples/results/branch-repo.clone.out

+<!-- BEGIN branch-repo.clone -->
 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
 <prompt>$</prompt> <userinput>hg clone myproject myproject-1.0.1</userinput>
 updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 </screen>
+<!-- END branch-repo.clone -->

File en/examples/results/branch-repo.merge.out

+<!-- BEGIN branch-repo.merge -->
 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 adding file changes
 added 2 changesets with 1 changes to 1 files
 </screen>
+<!-- END branch-repo.merge -->

File en/examples/results/branch-repo.new.out

+<!-- BEGIN branch-repo.new -->
 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
 <prompt>$</prompt> <userinput>hg clone myproject my-feature</userinput>
 updating working directory
 adding file changes
 added 1 changesets with 1 changes to 1 files
 </screen>
+<!-- END branch-repo.new -->

File en/examples/results/branch-repo.pull.out

+<!-- BEGIN branch-repo.pull -->
 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
 <prompt>$</prompt> <userinput>hg clone myproject myproject-merge</userinput>
 updating working directory
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 </screen>
+<!-- END branch-repo.pull -->

File en/examples/results/branch-repo.tag.out

+<!-- BEGIN branch-repo.tag -->
 <screen><prompt>$</prompt> <userinput>cd myproject</userinput>
 <prompt>$</prompt> <userinput>hg tag v1.0</userinput>
 </screen>
+<!-- END branch-repo.tag -->

File en/examples/results/branching.clone.out

+<!-- BEGIN branching.clone -->
 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
 <prompt>$</prompt> <userinput>hg clone -rv1.0 main stable</userinput>
 requesting all changes
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 </screen>
+<!-- END branching.clone -->

File en/examples/results/branching.init.out

+<!-- BEGIN branching.init -->
 <screen><prompt>$</prompt> <userinput>hg init main</userinput>
 <prompt>$</prompt> <userinput>cd main</userinput>
 <prompt>$</prompt> <userinput>echo 'This is a boring feature.' &gt; myfile</userinput>
 <prompt>$</prompt> <userinput>hg commit -A -m 'We have reached an important milestone!'</userinput>
 adding myfile
 </screen>
+<!-- END branching.init -->

File en/examples/results/branching.main.out

+<!-- BEGIN branching.main -->
 <screen><prompt>$</prompt> <userinput>cd ../main</userinput>
 <prompt>$</prompt> <userinput>echo 'This is exciting and new!' &gt;&gt; myfile</userinput>
 <prompt>$</prompt> <userinput>hg commit -m 'Add a new feature'</userinput>
 This is a boring feature.
 This is exciting and new!
 </screen>
+<!-- END branching.main -->

File en/examples/results/branching.merge.out

+<!-- BEGIN branching.merge -->
 <screen><prompt>$</prompt> <userinput>cd ../main</userinput>
 <prompt>$</prompt> <userinput>hg pull ../stable</userinput>
 pulling from ../stable
 This is a fix to a boring feature.
 This is exciting and new!
 </screen>
+<!-- END branching.merge -->

File en/examples/results/branching.stable.out

+<!-- BEGIN branching.stable -->
 <screen><prompt>$</prompt> <userinput>hg clone stable stable-fix</userinput>
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding file changes
 added 1 changesets with 1 changes to 1 files
 </screen>
+<!-- END branching.stable -->

File en/examples/results/branching.tag.out

+<!-- BEGIN branching.tag -->
 <screen><prompt>$</prompt> <userinput>hg tag v1.0</userinput>
 <prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 tip                                
 v1.0                               
 </screen>
+<!-- END branching.tag -->

File en/examples/results/branching.update.out

+<!-- BEGIN branching.update -->
 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
 <prompt>$</prompt> <userinput>hg clone -U main main-old</userinput>
 <prompt>$</prompt> <userinput>cd main-old</userinput>
 <prompt>$</prompt> <userinput>cat myfile</userinput>
 This is a boring feature.
 </screen>
+<!-- END branching.update -->

File en/examples/results/cmdref.diff-p.out

+<!-- BEGIN cmdref.diff-p -->
 <screen><prompt>$</prompt> <userinput>echo '[diff]' &gt;&gt; $HGRC</userinput>
 <prompt>$</prompt> <userinput>echo 'showfunc = False' &gt;&gt; $HGRC</userinput>
 <prompt>$</prompt> <userinput>hg diff</userinput>
 +    return 10;
  }
 </screen>
+<!-- END cmdref.diff-p -->

File en/examples/results/daily.copy.after.out

+<!-- BEGIN daily.copy.after -->
 <screen><prompt>$</prompt> <userinput>cp a z</userinput>
 <prompt>$</prompt> <userinput>hg copy --after a z</userinput>
 </screen>
+<!-- END daily.copy.after -->

File en/examples/results/daily.copy.cat.out

+<!-- BEGIN daily.copy.cat -->
 <screen><prompt>$</prompt> <userinput>cat file</userinput>
 line
 new contents
 <prompt>$</prompt> <userinput>cat ../my-copy/new-file</userinput>
 line
 </screen>
+<!-- END daily.copy.cat -->

File en/examples/results/daily.copy.clone.out

+<!-- BEGIN daily.copy.clone -->
 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
 <prompt>$</prompt> <userinput>hg clone my-copy your-copy</userinput>
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 </screen>
+<!-- END daily.copy.clone -->

File en/examples/results/daily.copy.copy.out

+<!-- BEGIN daily.copy.copy -->
 <screen><prompt>$</prompt> <userinput>cd my-copy</userinput>
 <prompt>$</prompt> <userinput>hg copy file new-file</userinput>
 </screen>
+<!-- END daily.copy.copy -->

File en/examples/results/daily.copy.dir-dest.out

+<!-- BEGIN daily.copy.dir-dest -->
 <screen><prompt>$</prompt> <userinput>mkdir d</userinput>
 <prompt>$</prompt> <userinput>hg copy a b d</userinput>
 <prompt>$</prompt> <userinput>ls d</userinput>
 a  b
 </screen>
+<!-- END daily.copy.dir-dest -->

File en/examples/results/daily.copy.dir-src-dest.out

+<!-- BEGIN daily.copy.dir-src-dest -->
 <screen><prompt>$</prompt> <userinput>hg copy c d</userinput>
 copying c/a/c to d/c/a/c
 </screen>
+<!-- END daily.copy.dir-src-dest -->

File en/examples/results/daily.copy.dir-src.out

+<!-- BEGIN daily.copy.dir-src -->
 <screen><prompt>$</prompt> <userinput>hg copy c e</userinput>
 copying c/a/c to e/a/c
 </screen>
+<!-- END daily.copy.dir-src -->

File en/examples/results/daily.copy.init.out

+<!-- BEGIN daily.copy.init -->
 <screen><prompt>$</prompt> <userinput>hg init my-copy</userinput>
 <prompt>$</prompt> <userinput>cd my-copy</userinput>
 <prompt>$</prompt> <userinput>echo line &gt; file</userinput>
 <prompt>$</prompt> <userinput>hg add file</userinput>
 <prompt>$</prompt> <userinput>hg commit -m 'Added a file'</userinput>
 </screen>
+<!-- END daily.copy.init -->

File en/examples/results/daily.copy.merge.out

+<!-- BEGIN daily.copy.merge -->
 <screen><prompt>$</prompt> <userinput>hg pull ../my-copy</userinput>
 pulling from ../my-copy
 searching for changes
 line
 new contents
 </screen>
+<!-- END daily.copy.merge -->

File en/examples/results/daily.copy.other.out

+<!-- BEGIN daily.copy.other -->
 <screen><prompt>$</prompt> <userinput>cd ../your-copy</userinput>
 <prompt>$</prompt> <userinput>echo 'new contents' &gt;&gt; file</userinput>
 <prompt>$</prompt> <userinput>hg commit -m 'Changed file'</userinput>
 </screen>
+<!-- END daily.copy.other -->

File en/examples/results/daily.copy.simple.out

+<!-- BEGIN daily.copy.simple -->
 <screen><prompt>$</prompt> <userinput>mkdir k</userinput>
 <prompt>$</prompt> <userinput>hg copy a k</userinput>
 <prompt>$</prompt> <userinput>ls k</userinput>
 a
 </screen>
+<!-- END daily.copy.simple -->

File en/examples/results/daily.copy.status-copy.out

+<!-- BEGIN daily.copy.status-copy -->
 <screen><prompt>$</prompt> <userinput>hg status -C</userinput>
 A new-file
   file
 <prompt>$</prompt> <userinput>hg commit -m 'Copied file'</userinput>
 </screen>
+<!-- END daily.copy.status-copy -->

File en/examples/results/daily.copy.status.out

+<!-- BEGIN daily.copy.status -->
 <screen><prompt>$</prompt> <userinput>hg status</userinput>
 A new-file
 </screen>
+<!-- END daily.copy.status -->

File en/examples/results/daily.files.add-dir.out

+<!-- BEGIN daily.files.add-dir -->
 <screen><prompt>$</prompt> <userinput>mkdir b</userinput>
 <prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
 <prompt>$</prompt> <userinput>echo c &gt; b/c</userinput>
 adding b/d/d
 <prompt>$</prompt> <userinput>hg commit -m 'Added all files in subdirectory'</userinput>
 </screen>
+<!-- END daily.files.add-dir -->

File en/examples/results/daily.files.add.out

+<!-- BEGIN daily.files.add -->
 <screen><prompt>$</prompt> <userinput>hg init add-example</userinput>
 <prompt>$</prompt> <userinput>cd add-example</userinput>
 <prompt>$</prompt> <userinput>echo a &gt; a</userinput>
 <prompt>$</prompt> <userinput>hg commit -m 'Added one file'</userinput>
 <prompt>$</prompt> <userinput>hg status</userinput>
 </screen>
+<!-- END daily.files.add -->

File en/examples/results/daily.files.addremove.out

+<!-- BEGIN daily.files.addremove -->
 <screen><prompt>$</prompt> <userinput>hg init addremove-example</userinput>
 <prompt>$</prompt> <userinput>cd addremove-example</userinput>
 <prompt>$</prompt> <userinput>echo a &gt; a</userinput>
 adding a
 adding b
 </screen>
+<!-- END daily.files.addremove -->

File en/examples/results/daily.files.commit-addremove.out

+<!-- BEGIN daily.files.commit-addremove -->
 <screen><prompt>$</prompt> <userinput>echo c &gt; c</userinput>
 <prompt>$</prompt> <userinput>hg commit -A -m 'Commit with addremove'</userinput>
 adding c
 </screen>
+<!-- END daily.files.commit-addremove -->

File en/examples/results/daily.files.hidden.out

+<!-- BEGIN daily.files.hidden -->
 <screen><prompt>$</prompt> <userinput>hg init hidden-example</userinput>
 <prompt>$</prompt> <userinput>cd hidden-example</userinput>
 <prompt>$</prompt> <userinput>mkdir empty</userinput>
 empty
 <prompt>$</prompt> <userinput>ls tmp/empty</userinput>
 </screen>
+<!-- END daily.files.hidden -->

File en/examples/results/daily.files.missing.out

+<!-- BEGIN daily.files.missing -->
 <screen><prompt>$</prompt> <userinput>hg init missing-example</userinput>
 <prompt>$</prompt> <userinput>cd missing-example</userinput>
 <prompt>$</prompt> <userinput>echo a &gt; a</userinput>
 <prompt>$</prompt> <userinput>hg status</userinput>
 ! a
 </screen>
+<!-- END daily.files.missing -->

File en/examples/results/daily.files.recover-missing.out

+<!-- BEGIN daily.files.recover-missing -->
 <screen><prompt>$</prompt> <userinput>hg revert a</userinput>
 <prompt>$</prompt> <userinput>cat a</userinput>
 a
 <prompt>$</prompt> <userinput>hg status</userinput>
 </screen>
+<!-- END daily.files.recover-missing -->

File en/examples/results/daily.files.remove-after.out

+<!-- BEGIN daily.files.remove-after -->
 <screen><prompt>$</prompt> <userinput>hg remove --after a</userinput>
 <prompt>$</prompt> <userinput>hg status</userinput>
 R a
 </screen>
+<!-- END daily.files.remove-after -->

File en/examples/results/daily.files.remove.out

+<!-- BEGIN daily.files.remove -->
 <screen><prompt>$</prompt> <userinput>hg init remove-example</userinput>
 <prompt>$</prompt> <userinput>cd remove-example</userinput>
 <prompt>$</prompt> <userinput>echo a &gt; a</userinput>
 <prompt>$</prompt> <userinput>hg remove b</userinput>
 removing b/b
 </screen>
+<!-- END daily.files.remove -->

File en/examples/results/daily.rename.rename.out

+<!-- BEGIN daily.rename.rename -->
 <screen><prompt>$</prompt> <userinput>hg rename a b</userinput>
 </screen>
+<!-- END daily.rename.rename -->

File en/examples/results/daily.rename.status-copy.out

+<!-- BEGIN daily.rename.status-copy -->
 <screen><prompt>$</prompt> <userinput>hg status -C</userinput>
 A b
   a
 R a
 </screen>
+<!-- END daily.rename.status-copy -->

File en/examples/results/daily.rename.status.out

+<!-- BEGIN daily.rename.status -->
 <screen><prompt>$</prompt> <userinput>hg status</userinput>
 A b
 R a
 </screen>
+<!-- END daily.rename.status -->

File en/examples/results/daily.revert.add.out

+<!-- BEGIN daily.revert.add -->
 <screen><prompt>$</prompt> <userinput>echo oops &gt; oops</userinput>
 <prompt>$</prompt> <userinput>hg add oops</userinput>
 <prompt>$</prompt> <userinput>hg status oops</userinput>
 <prompt>$</prompt> <userinput>hg status</userinput>
 ? oops
 </screen>
+<!-- END daily.revert.add -->

File en/examples/results/daily.revert.copy.out

+<!-- BEGIN daily.revert.copy -->
 <screen><prompt>$</prompt> <userinput>hg copy file new-file</userinput>
 <prompt>$</prompt> <userinput>hg revert new-file</userinput>
 <prompt>$</prompt> <userinput>hg status</userinput>
 ? new-file
 </screen>
+<!-- END daily.revert.copy -->

File en/examples/results/daily.revert.missing.out

+<!-- BEGIN daily.revert.missing -->
 <screen><prompt>$</prompt> <userinput>rm file</userinput>
 <prompt>$</prompt> <userinput>hg status</userinput>
 ! file
 <prompt>$</prompt> <userinput>ls file</userinput>
 file
 </screen>
+<!-- END daily.revert.missing -->

File en/examples/results/daily.revert.modify.out

+<!-- BEGIN daily.revert.modify -->
 <screen><prompt>$</prompt> <userinput>cat file</userinput>
 original content
 <prompt>$</prompt> <userinput>echo unwanted change &gt;&gt; file</userinput>
  original content
 +unwanted change
 </screen>
+<!-- END daily.revert.modify -->

File en/examples/results/daily.revert.remove.out

+<!-- BEGIN daily.revert.remove -->
 <screen><prompt>$</prompt> <userinput>hg remove file</userinput>
 <prompt>$</prompt> <userinput>hg status</userinput>
 R file
 <prompt>$</prompt> <userinput>ls file</userinput>
 file
 </screen>
+<!-- END daily.revert.remove -->

File en/examples/results/daily.revert.rename-orig.out

+<!-- BEGIN daily.revert.rename-orig -->
 <screen><prompt>$</prompt> <userinput>hg revert file</userinput>
 no changes needed to file
 <prompt>$</prompt> <userinput>hg status</userinput>
 ? new-file
 </screen>
+<!-- END daily.revert.rename-orig -->

File en/examples/results/daily.revert.rename.out

+<!-- BEGIN daily.revert.rename -->
 <screen><prompt>$</prompt> <userinput>hg rename file new-file</userinput>
 <prompt>$</prompt> <userinput>hg revert new-file</userinput>
 <prompt>$</prompt> <userinput>hg status</userinput>
 ? new-file
 </screen>
+<!-- END daily.revert.rename -->

File en/examples/results/daily.revert.status.out

+<!-- BEGIN daily.revert.status -->
 <screen><prompt>$</prompt> <userinput>hg status</userinput>
 ? file.orig
 <prompt>$</prompt> <userinput>cat file.orig</userinput>
 original content
 unwanted change
 </screen>
+<!-- END daily.revert.status -->

File en/examples/results/daily.revert.unmodify.out

+<!-- BEGIN daily.revert.unmodify -->
 <screen><prompt>$</prompt> <userinput>hg status</userinput>
 M file
 <prompt>$</prompt> <userinput>hg revert file</userinput>
 <prompt>$</prompt> <userinput>cat file</userinput>
 original content
 </screen>
+<!-- END daily.revert.unmodify -->

File en/examples/results/extdiff.diff.out

+<!-- BEGIN extdiff.diff -->
 <screen><prompt>$</prompt> <userinput>hg diff</userinput>
 diff -r  myfile
 
  The first line.
 +The second line.
 </screen>
+<!-- END extdiff.diff -->

File en/examples/results/extdiff.extdiff-ctx.out

+<!-- BEGIN extdiff.extdiff-ctx -->
 <screen><prompt>$</prompt> <userinput>hg extdiff -o -NprcC5</userinput>
 
 
   The first line.
 + The second line.
 </screen>
+<!-- END extdiff.extdiff-ctx -->

File en/examples/results/extdiff.extdiff.out

+<!-- BEGIN extdiff.extdiff -->
 <screen><prompt>$</prompt> <userinput>hg extdiff</userinput>
 
 
  The first line.
 +The second line.
 </screen>
+<!-- END extdiff.extdiff -->

File en/examples/results/filenames.dirs.out

+<!-- BEGIN filenames.dirs -->
 <screen><prompt>$</prompt> <userinput>hg status src</userinput>
 ? src/main.py
 ? src/watcher/_watcher.c
 ? src/watcher/watcher.py
 ? src/xyzzy.txt
 </screen>
+<!-- END filenames.dirs -->

File en/examples/results/filenames.files.out

+<!-- BEGIN filenames.files -->
 <screen><prompt>$</prompt> <userinput>hg add COPYING README examples/simple.py</userinput>
 </screen>
+<!-- END filenames.files -->

File en/examples/results/filenames.filter.exclude.out

+<!-- BEGIN filenames.filter.exclude -->
 <screen><prompt>$</prompt> <userinput>hg status -X '**.py' src</userinput>
 ? src/watcher/_watcher.c
 ? src/xyzzy.txt
 </screen>
+<!-- END filenames.filter.exclude -->

File en/examples/results/filenames.filter.include.out

+<!-- BEGIN filenames.filter.include -->
 <screen><prompt>$</prompt> <userinput>hg status -I '*.in'</userinput>
 ? MANIFEST.in
 </screen>
+<!-- END filenames.filter.include -->

File en/examples/results/filenames.glob.group.out

+<!-- BEGIN filenames.glob.group -->
 <screen><prompt>$</prompt> <userinput>hg status 'glob:*.{in,py}'</userinput>
 ? MANIFEST.in
 ? setup.py
 </screen>
+<!-- END filenames.glob.group -->

File en/examples/results/filenames.glob.question.out

+<!-- BEGIN filenames.glob.question -->
 <screen><prompt>$</prompt> <userinput>hg status 'glob:**.?'</userinput>
 ? src/watcher/_watcher.c
 </screen>
+<!-- END filenames.glob.question -->

File en/examples/results/filenames.glob.range.out

+<!-- BEGIN filenames.glob.range -->
 <screen><prompt>$</prompt> <userinput>hg status 'glob:**[nr-t]'</userinput>
 ? MANIFEST.in
 ? src/xyzzy.txt
 </screen>
+<!-- END filenames.glob.range -->

File en/examples/results/filenames.glob.star-starstar.out

+<!-- BEGIN filenames.glob.star-starstar -->
 <screen><prompt>$</prompt> <userinput>hg status 'glob:*.py'</userinput>
 ? setup.py
 <prompt>$</prompt> <userinput>hg status 'glob:**.py'</userinput>
 ? setup.py
 ? src/watcher/watcher.py
 </screen>
+<!-- END filenames.glob.star-starstar -->

File en/examples/results/filenames.glob.star.out

+<!-- BEGIN filenames.glob.star -->
 <screen><prompt>$</prompt> <userinput>hg add 'glob:*.py'</userinput>
 adding main.py
 </screen>
+<!-- END filenames.glob.star -->

File en/examples/results/filenames.glob.starstar.out

+<!-- BEGIN filenames.glob.starstar -->
 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
 <prompt>$</prompt> <userinput>hg status 'glob:**.py'</userinput>
 A examples/simple.py
 ? setup.py
 ? src/watcher/watcher.py
 </screen>
+<!-- END filenames.glob.starstar -->

File en/examples/results/filenames.wdir-relname.out

+<!-- BEGIN filenames.wdir-relname -->
 <screen><prompt>$</prompt> <userinput>hg status</userinput>
 A COPYING
 A README
 ? watcher/watcher.py
 ? xyzzy.txt
 </screen>
+<!-- END filenames.wdir-relname -->

File en/examples/results/filenames.wdir-subdir.out

+<!-- BEGIN filenames.wdir-subdir -->
 <screen><prompt>$</prompt> <userinput>cd src</userinput>
 <prompt>$</prompt> <userinput>hg add -n</userinput>
 adding ../MANIFEST.in
 adding watcher/watcher.py
 adding xyzzy.txt
 </screen>
+<!-- END filenames.wdir-subdir -->

File en/examples/results/hook.msglen.go.out

+<!-- BEGIN hook.msglen.go -->
 <screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput>
 [hooks]
 pretxncommit.msglen = test `hg tip --template {desc} | wc -c` -ge 10
 abort: pretxncommit.msglen hook exited with status 1
 <prompt>$</prompt> <userinput>hg commit -A -m 'long enough'</userinput>
 </screen>
+<!-- END hook.msglen.go -->

File en/examples/results/hook.simple.ext.out

+<!-- BEGIN hook.simple.ext -->
 <screen><prompt>$</prompt> <userinput>echo 'commit.when = echo -n "date of commit: "; date' &gt;&gt; .hg/hgrc</userinput>
 <prompt>$</prompt> <userinput>echo a &gt;&gt; a</userinput>
 <prompt>$</prompt> <userinput>hg commit -m 'i have two hooks'</userinput>
 committed 
 
 </screen>
+<!-- END hook.simple.ext -->

File en/examples/results/hook.simple.init.out

+<!-- BEGIN hook.simple.init -->
 <screen><prompt>$</prompt> <userinput>hg init hook-test</userinput>
 <prompt>$</prompt> <userinput>cd hook-test</userinput>
 <prompt>$</prompt> <userinput>echo '[hooks]' &gt;&gt; .hg/hgrc</userinput>
 <prompt>$</prompt> <userinput>hg commit -m 'testing commit hook'</userinput>
 committed 
 </screen>
+<!-- END hook.simple.init -->

File en/examples/results/hook.simple.pretxncommit.out

+<!-- BEGIN hook.simple.pretxncommit -->
 <screen><prompt>$</prompt> <userinput>cat check_bug_id</userinput>
 #!/bin/sh
 # check that a commit comment mentions a numeric bug id
 committed 
 
 </screen>
+<!-- END hook.simple.pretxncommit -->

File en/examples/results/hook.ws.better.out

+<!-- BEGIN hook.ws.better -->
 <screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput>
 [hooks]
 pretxncommit.whitespace = .hg/check_whitespace.py
 rollback completed
 abort: pretxncommit.whitespace hook exited with status 1
 </screen>
+<!-- END hook.ws.better -->

File en/examples/results/hook.ws.simple.out

+<!-- BEGIN hook.ws.simple -->
 <screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput>
 [hooks]
 pretxncommit.whitespace = hg export tip | (! egrep -q '^\+.*[ \t]$')
 <prompt>$</prompt> <userinput>echo 'a' &gt; a</userinput>
 <prompt>$</prompt> <userinput>hg commit -A -m 'drop trailing whitespace and try again'</userinput>
 </screen>
+<!-- END hook.ws.simple -->

File en/examples/results/issue29.go.out

+<!-- BEGIN issue29.go -->
 <screen><prompt>$</prompt> <userinput>hg init issue29</userinput>
 <prompt>$</prompt> <userinput>cd issue29</userinput>
 <prompt>$</prompt> <userinput>echo a &gt; a</userinput>
 <prompt>$</prompt> <userinput>hg merge</userinput>
 
 </screen>
+<!-- END issue29.go -->

File en/examples/results/mq.dodiff.diff.out

+<!-- BEGIN mq.dodiff.diff -->
 <screen><prompt>$</prompt> <userinput>echo 'this is my original thought' &gt; oldfile</userinput>
 <prompt>$</prompt> <userinput>echo 'i have changed my mind' &gt; newfile</userinput>
 <prompt>$</prompt> <userinput>diff -u oldfile newfile &gt; tiny.patch</userinput>
 <prompt>$</prompt> <userinput>cat oldfile</userinput>
 i have changed my mind
 </screen>
+<!-- END mq.dodiff.diff -->

File en/examples/results/mq.guards.init.out

+<!-- BEGIN mq.guards.init -->
 <screen><prompt>$</prompt> <userinput>hg qinit</userinput>
 <prompt>$</prompt> <userinput>hg qnew hello.patch</userinput>
 <prompt>$</prompt> <userinput>echo hello &gt; hello</userinput>
 <prompt>$</prompt> <userinput>hg add goodbye</userinput>
 <prompt>$</prompt> <userinput>hg qrefresh</userinput>
 </screen>
+<!-- END mq.guards.init -->

File en/examples/results/mq.guards.qguard.neg.out

+<!-- BEGIN mq.guards.qguard.neg -->
 <screen><prompt>$</prompt> <userinput>hg qguard hello.patch -quux</userinput>
+hg qguard: option -u not recognized
+hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]...
+
+set or print guards for a patch
+
+    Guards control whether a patch can be pushed. A patch with no
+    guards is always pushed. A patch with a positive guard ("+foo") is
+    pushed only if the qselect command has activated it. A patch with
+    a negative guard ("-foo") is never pushed if the qselect command
+    has activated it.
+
+    With no arguments, print the currently active guards.
+    With arguments, set guards for the named patch.
+    NOTE: Specifying negative guards now requires '--'.
+
+    To set guards on another patch:
+      hg qguard -- other.patch +2.6.17 -stable
+
+options:
+
+ -l --list  list all patches and guards
+ -n --none  drop all guards
+
+use "hg -v help qguard" to show global options
 <prompt>$</prompt> <userinput>hg qguard hello.patch</userinput>
-hello.patch: -quux
+hello.patch: unguarded
 </screen>
+<!-- END mq.guards.qguard.neg -->

File en/examples/results/mq.guards.qguard.out

+<!-- BEGIN mq.guards.qguard -->
 <screen><prompt>$</prompt> <userinput>hg qguard</userinput>
 goodbye.patch: unguarded
 </screen>
+<!-- END mq.guards.qguard -->

File en/examples/results/mq.guards.qguard.pos.out

+<!-- BEGIN mq.guards.qguard.pos -->
 <screen><prompt>$</prompt> <userinput>hg qguard +foo</userinput>
 <prompt>$</prompt> <userinput>hg qguard</userinput>
 goodbye.patch: +foo
 </screen>
+<!-- END mq.guards.qguard.pos -->

File en/examples/results/mq.guards.qselect.cat.out

+<!-- BEGIN mq.guards.qselect.cat -->
 <screen><prompt>$</prompt> <userinput>cat .hg/patches/guards</userinput>
 foo
 </screen>
+<!-- END mq.guards.qselect.cat -->

File en/examples/results/mq.guards.qselect.error.out

+<!-- BEGIN mq.guards.qselect.error -->
 <screen><prompt>$</prompt> <userinput>hg qselect +foo</userinput>
 abort: guard '+foo' starts with invalid character: '+'
 </screen>
+<!-- END mq.guards.qselect.error -->

File en/examples/results/mq.guards.qselect.foo.out

+<!-- BEGIN mq.guards.qselect.foo -->
 <screen><prompt>$</prompt> <userinput>hg qpop -a</userinput>
 patch queue now empty
 <prompt>$</prompt> <userinput>hg qselect</userinput>
 <prompt>$</prompt> <userinput>hg qselect</userinput>
 foo
 </screen>
+<!-- END mq.guards.qselect.foo -->

File en/examples/results/mq.guards.qselect.foobar.out

+<!-- BEGIN mq.guards.qselect.foobar -->
 <screen><prompt>$</prompt> <userinput>hg qselect foo bar</userinput>
-number of unguarded, unapplied patches has changed from 0 to 2
+number of unguarded, unapplied patches has changed from 0 to 1
 <prompt>$</prompt> <userinput>hg qpop -a</userinput>
-no patches applied
+patch queue now empty
 <prompt>$</prompt> <userinput>hg qpush -a</userinput>
 applying hello.patch
 applying goodbye.patch
 now at: goodbye.patch
 </screen>
+<!-- END mq.guards.qselect.foobar -->

File en/examples/results/mq.guards.qselect.qpush.out

+<!-- BEGIN mq.guards.qselect.qpush -->
 <screen><prompt>$</prompt> <userinput>hg qpush -a</userinput>
 applying hello.patch
 applying goodbye.patch
 now at: goodbye.patch
 </screen>
+<!-- END mq.guards.qselect.qpush -->

File en/examples/results/mq.guards.qselect.quux.out

+<!-- BEGIN mq.guards.qselect.quux -->
 <screen><prompt>$</prompt> <userinput>hg qselect quux</userinput>
-number of guarded, applied patches has changed from 0 to 2
+number of guarded, applied patches has changed from 0 to 1
 <prompt>$</prompt> <userinput>hg qpop -a</userinput>
 patch queue now empty
 <prompt>$</prompt> <userinput>hg qpush -a</userinput>
-patch series already fully applied
+applying hello.patch
+skipping goodbye.patch - guarded by ['+foo']
+now at: hello.patch
 </screen>
+<!-- END mq.guards.qselect.quux -->

File en/examples/results/mq.guards.series.out

+<!-- BEGIN mq.guards.series -->
 <screen><prompt>$</prompt> <userinput>cat .hg/patches/series</userinput>
-hello.patch #-quux
+hello.patch
 goodbye.patch #+foo
 </screen>
+<!-- END mq.guards.series -->

File en/examples/results/mq.id.output.out

+<!-- BEGIN mq.id.output -->
 <screen><prompt>$</prompt> <userinput>hg qapplied</userinput>
 first.patch
 second.patch
 @@ -0,0 +1,1 @@
 +double u;
 </screen>
+<!-- END mq.id.output -->

File en/examples/results/mq.qinit-help.help.out

+<!-- BEGIN mq.qinit-help.help -->
 <screen><prompt>$</prompt> <userinput>hg help qinit</userinput>
 hg qinit [-c]
 
 
 use "hg -v help qinit" to show global options
 </screen>
+<!-- END mq.qinit-help.help -->

File en/examples/results/mq.tarball.download.out

+<!-- BEGIN mq.tarball.download -->
 <screen><prompt>$</prompt> <userinput>download netplug-1.2.5.tar.bz2</userinput>
 <prompt>$</prompt> <userinput>tar jxf netplug-1.2.5.tar.bz2</userinput>
 <prompt>$</prompt> <userinput>cd netplug-1.2.5</userinput>
 updating working directory
 18 files updated, 0 files merged, 0 files removed, 0 files unresolved
 </screen>
+<!-- END mq.tarball.download -->

File en/examples/results/mq.tarball.newsource.out

+<!-- BEGIN mq.tarball.newsource -->
 <screen><prompt>$</prompt> <userinput>hg qpop -a</userinput>
 patch queue now empty
 <prompt>$</prompt> <userinput>cd ..</userinput>
 <prompt>$</prompt> <userinput>cd netplug-1.2.8</userinput>
 <prompt>$</prompt> <userinput>hg commit --addremove --message netplug-1.2.8</userinput>
 </screen>
+<!-- END mq.tarball.newsource -->

File en/examples/results/mq.tarball.qinit.out

+<!-- BEGIN mq.tarball.qinit -->
 <screen><prompt>$</prompt> <userinput>cd netplug</userinput>
 <prompt>$</prompt> <userinput>hg qinit</userinput>
 <prompt>$</prompt> <userinput>hg qnew -m 'fix build problem with gcc 4' build-fix.patch</userinput>
          do_log(LOG_ERR, "Could not get socket details: %m");
 
 </screen>
+<!-- END mq.tarball.qinit -->

File en/examples/results/mq.tarball.repush.out

+<!-- BEGIN mq.tarball.repush -->
 <screen><prompt>$</prompt> <userinput>cd ../netplug</userinput>
 <prompt>$</prompt> <userinput>hg pull ../netplug-1.2.8</userinput>
 pulling from ../netplug-1.2.8
 applying build-fix.patch
 now at: build-fix.patch
 </screen>
+<!-- END mq.tarball.repush -->

File en/examples/results/mq.tools.lsdiff.out

+<!-- BEGIN mq.tools.lsdiff -->
 <screen><prompt>$</prompt> <userinput>lsdiff -nvv remove-redundant-null-checks.patch</userinput>
 22	File #1  	a/drivers/char/agp/sgi-agp.c
 	24	Hunk #1	static int __devinit agp_sgi_init(void)
 178	File #8  	a/drivers/video/au1100fb.c
 	180	Hunk #1	void __exit au1100fb_cleanup(void)
 </screen>
+<!-- END mq.tools.lsdiff -->

File en/examples/results/mq.tools.tools.out

+<!-- BEGIN mq.tools.tools -->
 <screen><prompt>$</prompt> <userinput>diffstat -p1 remove-redundant-null-checks.patch</userinput>
  drivers/char/agp/sgi-agp.c        |    5 ++---
  drivers/char/hvcs.c               |   11 +++++------
  
  module_init(au1100fb_init);
 </screen>
+<!-- END mq.tools.tools -->

File en/examples/results/mq.tutorial.add.out

+<!-- BEGIN mq.tutorial.add -->
 <screen><prompt>$</prompt> <userinput>echo 'file 3, line 1' &gt;&gt; file3</userinput>
 <prompt>$</prompt> <userinput>hg qnew add-file3.patch</userinput>
 <prompt>$</prompt> <userinput>hg qnew -f add-file3.patch</userinput>
 abort: patch "add-file3.patch" already exists
 </screen>
+<!-- END mq.tutorial.add -->

File en/examples/results/mq.tutorial.qinit.out

+<!-- BEGIN mq.tutorial.qinit -->
 <screen><prompt>$</prompt> <userinput>hg init mq-sandbox</userinput>
 <prompt>$</prompt> <userinput>cd mq-sandbox</userinput>
 <prompt>$</prompt> <userinput>echo 'line 1' &gt; file1</userinput>
 <prompt>$</prompt> <userinput>hg commit -m'first change'</userinput>
 <prompt>$</prompt> <userinput>hg qinit</userinput>
 </screen>
+<!-- END mq.tutorial.qinit -->

File en/examples/results/mq.tutorial.qnew.out

+<!-- BEGIN mq.tutorial.qnew -->
 <screen><prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 tag:         tip
 <prompt>$</prompt> <userinput>ls .hg/patches</userinput>
 first.patch  series  status
 </screen>
+<!-- END mq.tutorial.qnew -->

File en/examples/results/mq.tutorial.qnew2.out

+<!-- BEGIN mq.tutorial.qnew2 -->
 <screen><prompt>$</prompt> <userinput>hg qnew second.patch</userinput>
 <prompt>$</prompt> <userinput>hg log --style=compact --limit=2</userinput>
-2[qtip,second.patch,tip]      2009-03-10 04:38 +0000   bos
+2[qtip,second.patch,tip]      2009-03-31 19:08 +0000   bos
   [mq]: second.patch
 
-1[first.patch,qbase]      2009-03-10 04:38 +0000   bos
+1[first.patch,qbase]      2009-03-31 19:08 +0000   bos
   [mq]: first.patch
 
 <prompt>$</prompt> <userinput>echo 'line 4' &gt;&gt; file1</userinput>
 <prompt>$</prompt> <userinput>hg qrefresh</userinput>
 <prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
-2[qtip,second.patch,tip]      2009-03-10 04:38 +0000   bos
+2[qtip,second.patch,tip]      2009-03-31 19:08 +0000   bos
   [mq]: second.patch
 
 diff -r  -r  file1
 1: line 3
 2: line 4
 </screen>
+<!-- END mq.tutorial.qnew2 -->

File en/examples/results/mq.tutorial.qpop.out

+<!-- BEGIN mq.tutorial.qpop -->
 <screen><prompt>$</prompt> <userinput>hg qapplied</userinput>
 first.patch
 second.patch
 line 2
 line 3
 </screen>
+<!-- END mq.tutorial.qpop -->

File en/examples/results/mq.tutorial.qpush-a.out

+<!-- BEGIN mq.tutorial.qpush-a -->
 <screen><prompt>$</prompt> <userinput>hg qpush -a</userinput>
 applying second.patch
 now at: second.patch
 line 3
 line 4
 </screen>
+<!-- END mq.tutorial.qpush-a -->

File en/examples/results/mq.tutorial.qrefresh.out

+<!-- BEGIN mq.tutorial.qrefresh -->
 <screen><prompt>$</prompt> <userinput>echo 'line 2' &gt;&gt; file1</userinput>
 <prompt>$</prompt> <userinput>hg diff</userinput>
 diff -r  file1
 <prompt>$</prompt> <userinput>hg qrefresh</userinput>
 <prompt>$</prompt> <userinput>hg diff</userinput>
 <prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
-1[qtip,first.patch,tip,qbase]      2009-03-10 04:38 +0000   bos
+1[qtip,first.patch,tip,qbase]      2009-03-31 19:08 +0000   bos
   [mq]: first.patch
 
 diff -r  -r  file1
 +line 2
 
 </screen>
+<!-- END mq.tutorial.qrefresh -->

File en/examples/results/mq.tutorial.qrefresh2.out

+<!-- BEGIN mq.tutorial.qrefresh2 -->
 <screen><prompt>$</prompt> <userinput>echo 'line 3' &gt;&gt; file1</userinput>
 <prompt>$</prompt> <userinput>hg status</userinput>
 M file1
 <prompt>$</prompt> <userinput>hg qrefresh</userinput>
 <prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
-1[qtip,first.patch,tip,qbase]      2009-03-10 04:38 +0000   bos
+1[qtip,first.patch,tip,qbase]      2009-03-31 19:08 +0000   bos
   [mq]: first.patch
 
 diff -r  -r  file1
 +line 3
 
 </screen>
+<!-- END mq.tutorial.qrefresh2 -->

File en/examples/results/mq.tutorial.qseries.out

+<!-- BEGIN mq.tutorial.qseries -->
 <screen><prompt>$</prompt> <userinput>hg qseries</userinput>
 first.patch
 second.patch
 first.patch
 second.patch
 </screen>