Mercurial > hgbook
changeset 709:4432ad34b8e5
Check in example outputs with begin/end markers.
line wrap: on
line diff
--- a/en/examples/results/backout.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN backout.init --> <screen><prompt>$</prompt> <userinput>hg init myrepo</userinput> <prompt>$</prompt> <userinput>cd myrepo</userinput> <prompt>$</prompt> <userinput>echo first change >> myfile</userinput> @@ -6,3 +7,4 @@ <prompt>$</prompt> <userinput>echo second change >> myfile</userinput> <prompt>$</prompt> <userinput>hg commit -m 'second change'</userinput> </screen> +<!-- END backout.init -->
--- a/en/examples/results/backout.manual.backout.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.manual.backout.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN backout.manual.backout --> <screen><prompt>$</prompt> <userinput>echo third change >> myfile</userinput> <prompt>$</prompt> <userinput>hg commit -m 'third change'</userinput> <prompt>$</prompt> <userinput>hg backout -m 'back out second change' 1</userinput> @@ -7,3 +8,4 @@ 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 -->
--- a/en/examples/results/backout.manual.cat.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.manual.cat.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- BEGIN backout.manual.cat --> <screen><prompt>$</prompt> <userinput>cat myfile</userinput> first change second change third change </screen> +<!-- END backout.manual.cat -->
--- a/en/examples/results/backout.manual.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.manual.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN backout.manual.clone --> <screen><prompt>$</prompt> <userinput>cd ..</userinput> <prompt>$</prompt> <userinput>hg clone -r1 myrepo newrepo</userinput> requesting all changes @@ -9,3 +10,4 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved <prompt>$</prompt> <userinput>cd newrepo</userinput> </screen> +<!-- END backout.manual.clone -->
--- a/en/examples/results/backout.manual.heads.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.manual.heads.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN backout.manual.heads --> <screen><prompt>$</prompt> <userinput>hg heads</userinput> changeset: tag: tip @@ -12,3 +13,4 @@ summary: third change </screen> +<!-- END backout.manual.heads -->
--- a/en/examples/results/backout.manual.log.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.manual.log.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,14 +1,16 @@ +<!-- 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 -->
--- a/en/examples/results/backout.manual.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.manual.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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 @@ -7,3 +8,4 @@ first change third change </screen> +<!-- END backout.manual.merge -->
--- a/en/examples/results/backout.manual.parents.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.manual.parents.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN backout.manual.parents --> <screen><prompt>$</prompt> <userinput>hg parents</userinput> changeset: user: Bryan O'Sullivan <bos@serpentine.com> @@ -5,3 +6,4 @@ summary: third change </screen> +<!-- END backout.manual.parents -->
--- a/en/examples/results/backout.non-tip.backout.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.non-tip.backout.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN backout.non-tip.backout --> <screen><prompt>$</prompt> <userinput>echo third change >> myfile</userinput> <prompt>$</prompt> <userinput>hg commit -m 'third change'</userinput> <prompt>$</prompt> <userinput>hg backout --merge -m 'back out second change' 1</userinput> @@ -9,3 +10,4 @@ 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 -->
--- a/en/examples/results/backout.non-tip.cat.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.non-tip.cat.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- BEGIN backout.non-tip.cat --> <screen><prompt>$</prompt> <userinput>cat myfile</userinput> first change third change </screen> +<!-- END backout.non-tip.cat -->
--- a/en/examples/results/backout.non-tip.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.non-tip.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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 @@ -9,3 +10,4 @@ 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 -->
--- a/en/examples/results/backout.simple.log.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.simple.log.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,11 +1,13 @@ +<!-- 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 -->
--- a/en/examples/results/backout.simple.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.simple.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ +<!-- 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 -->
--- a/en/examples/results/bisect.commits.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.commits.out Tue Mar 31 12:19:01 2009 -0700 @@ -9,3 +9,5 @@ + +
--- a/en/examples/results/bisect.help.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.help.out Tue Mar 31 12:19:01 2009 -0700 @@ -32,3 +32,5 @@ + +
--- a/en/examples/results/bisect.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + +
--- a/en/examples/results/bisect.search.bad-init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.bad-init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + +
--- a/en/examples/results/bisect.search.good-init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.good-init.out Tue Mar 31 12:19:01 2009 -0700 @@ -3,3 +3,5 @@ + +
--- a/en/examples/results/bisect.search.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + +
--- a/en/examples/results/bisect.search.mytest.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.mytest.out Tue Mar 31 12:19:01 2009 -0700 @@ -9,3 +9,5 @@ + +
--- a/en/examples/results/bisect.search.reset.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.reset.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + +
--- a/en/examples/results/bisect.search.rest.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.rest.out Tue Mar 31 12:19:01 2009 -0700 @@ -18,3 +18,5 @@ + +
--- a/en/examples/results/bisect.search.step1.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.step1.out Tue Mar 31 12:19:01 2009 -0700 @@ -10,3 +10,5 @@ + +
--- a/en/examples/results/bisect.search.step2.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.step2.out Tue Mar 31 12:19:01 2009 -0700 @@ -4,3 +4,5 @@ + +
--- a/en/examples/results/branch-named.branch.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.branch.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- BEGIN branch-named.branch --> <screen><prompt>$</prompt> <userinput>hg branch</userinput> default </screen> +<!-- END branch-named.branch -->
--- a/en/examples/results/branch-named.branches.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.branches.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN branch-named.branches --> <screen><prompt>$</prompt> <userinput>hg tip</userinput> changeset: tag: tip @@ -8,3 +9,4 @@ <prompt>$</prompt> <userinput>hg branches</userinput> default </screen> +<!-- END branch-named.branches -->
--- a/en/examples/results/branch-named.commit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.commit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN branch-named.commit --> <screen><prompt>$</prompt> <userinput>echo 'hello again' >> myfile</userinput> <prompt>$</prompt> <userinput>hg commit -m 'Second commit'</userinput> <prompt>$</prompt> <userinput>hg tip</userinput> @@ -9,3 +10,4 @@ summary: Second commit </screen> +<!-- END branch-named.commit -->
--- a/en/examples/results/branch-named.create.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.create.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- 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 -->
--- a/en/examples/results/branch-named.foo-commit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.foo-commit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN branch-named.foo-commit --> <screen><prompt>$</prompt> <userinput>echo something > somefile</userinput> <prompt>$</prompt> <userinput>hg commit -A -m 'New file'</userinput> adding somefile @@ -18,3 +19,4 @@ summary: Third commit </screen> +<!-- END branch-named.foo-commit -->
--- a/en/examples/results/branch-named.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN branch-named.merge --> <screen><prompt>$</prompt> <userinput>hg branch</userinput> bar <prompt>$</prompt> <userinput>hg merge foo</userinput> @@ -15,3 +16,4 @@ summary: Merge </screen> +<!-- END branch-named.merge -->
--- a/en/examples/results/branch-named.parents.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.parents.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN branch-named.parents --> <screen><prompt>$</prompt> <userinput>hg parents</userinput> changeset: branch: bar @@ -11,3 +12,4 @@ foo (inactive) default (inactive) </screen> +<!-- END branch-named.parents -->
--- a/en/examples/results/branch-named.rebranch.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.rebranch.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN branch-named.rebranch --> <screen><prompt>$</prompt> <userinput>hg branch</userinput> foo <prompt>$</prompt> <userinput>hg branch bar</userinput> @@ -14,3 +15,4 @@ summary: Third commit </screen> +<!-- END branch-named.rebranch -->
--- a/en/examples/results/branch-named.status.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.status.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN branch-named.status --> <screen><prompt>$</prompt> <userinput>hg status</userinput> <prompt>$</prompt> <userinput>hg tip</userinput> changeset: @@ -7,3 +8,4 @@ summary: Initial commit </screen> +<!-- END branch-named.status -->
--- a/en/examples/results/branch-named.update-bar.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.update-bar.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- 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 -->
--- a/en/examples/results/branch-named.update-nothing.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.update-nothing.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- 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 -->
--- a/en/examples/results/branch-named.update-switchy.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.update-switchy.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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> @@ -18,3 +19,4 @@ summary: Third commit </screen> +<!-- END branch-named.update-switchy -->
--- a/en/examples/results/branch-repo.bugfix.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-repo.bugfix.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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 @@ -12,3 +13,4 @@ adding file changes added 1 changesets with 1 changes to 1 files </screen> +<!-- END branch-repo.bugfix -->
--- a/en/examples/results/branch-repo.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-repo.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- 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 -->
--- a/en/examples/results/branch-repo.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-repo.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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) @@ -10,3 +11,4 @@ adding file changes added 2 changesets with 1 changes to 1 files </screen> +<!-- END branch-repo.merge -->
--- a/en/examples/results/branch-repo.new.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-repo.new.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN branch-repo.new --> <screen><prompt>$</prompt> <userinput>cd ..</userinput> <prompt>$</prompt> <userinput>hg clone myproject my-feature</userinput> updating working directory @@ -14,3 +15,4 @@ adding file changes added 1 changesets with 1 changes to 1 files </screen> +<!-- END branch-repo.new -->
--- a/en/examples/results/branch-repo.pull.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-repo.pull.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN branch-repo.pull --> <screen><prompt>$</prompt> <userinput>cd ..</userinput> <prompt>$</prompt> <userinput>hg clone myproject myproject-merge</userinput> updating working directory @@ -12,3 +13,4 @@ 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 -->
--- a/en/examples/results/branch-repo.tag.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-repo.tag.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- BEGIN branch-repo.tag --> <screen><prompt>$</prompt> <userinput>cd myproject</userinput> <prompt>$</prompt> <userinput>hg tag v1.0</userinput> </screen> +<!-- END branch-repo.tag -->
--- a/en/examples/results/branching.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branching.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN branching.clone --> <screen><prompt>$</prompt> <userinput>cd ..</userinput> <prompt>$</prompt> <userinput>hg clone -rv1.0 main stable</userinput> requesting all changes @@ -8,3 +9,4 @@ updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved </screen> +<!-- END branching.clone -->
--- a/en/examples/results/branching.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branching.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ +<!-- 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.' > myfile</userinput> <prompt>$</prompt> <userinput>hg commit -A -m 'We have reached an important milestone!'</userinput> adding myfile </screen> +<!-- END branching.init -->
--- a/en/examples/results/branching.main.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branching.main.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN branching.main --> <screen><prompt>$</prompt> <userinput>cd ../main</userinput> <prompt>$</prompt> <userinput>echo 'This is exciting and new!' >> myfile</userinput> <prompt>$</prompt> <userinput>hg commit -m 'Add a new feature'</userinput> @@ -5,3 +6,4 @@ This is a boring feature. This is exciting and new! </screen> +<!-- END branching.main -->
--- a/en/examples/results/branching.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branching.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN branching.merge --> <screen><prompt>$</prompt> <userinput>cd ../main</userinput> <prompt>$</prompt> <userinput>hg pull ../stable</userinput> pulling from ../stable @@ -16,3 +17,4 @@ This is a fix to a boring feature. This is exciting and new! </screen> +<!-- END branching.merge -->
--- a/en/examples/results/branching.stable.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branching.stable.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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 @@ -12,3 +13,4 @@ adding file changes added 1 changesets with 1 changes to 1 files </screen> +<!-- END branching.stable -->
--- a/en/examples/results/branching.tag.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branching.tag.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN branching.tag --> <screen><prompt>$</prompt> <userinput>hg tag v1.0</userinput> <prompt>$</prompt> <userinput>hg tip</userinput> changeset: @@ -10,3 +11,4 @@ tip v1.0 </screen> +<!-- END branching.tag -->
--- a/en/examples/results/branching.update.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branching.update.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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> @@ -6,3 +7,4 @@ <prompt>$</prompt> <userinput>cat myfile</userinput> This is a boring feature. </screen> +<!-- END branching.update -->
--- a/en/examples/results/cmdref.diff-p.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/cmdref.diff-p.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN cmdref.diff-p --> <screen><prompt>$</prompt> <userinput>echo '[diff]' >> $HGRC</userinput> <prompt>$</prompt> <userinput>echo 'showfunc = False' >> $HGRC</userinput> <prompt>$</prompt> <userinput>hg diff</userinput> @@ -21,3 +22,4 @@ + return 10; } </screen> +<!-- END cmdref.diff-p -->
--- a/en/examples/results/daily.copy.after.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.after.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- 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 -->
--- a/en/examples/results/daily.copy.cat.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.cat.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ +<!-- 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 -->
--- a/en/examples/results/daily.copy.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- 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 -->
--- a/en/examples/results/daily.copy.copy.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.copy.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- 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 -->
--- a/en/examples/results/daily.copy.dir-dest.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.dir-dest.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- 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 -->
--- a/en/examples/results/daily.copy.dir-src-dest.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.dir-src-dest.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- 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 -->
--- a/en/examples/results/daily.copy.dir-src.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.dir-src.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- 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 -->
--- a/en/examples/results/daily.copy.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ +<!-- 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 > file</userinput> <prompt>$</prompt> <userinput>hg add file</userinput> <prompt>$</prompt> <userinput>hg commit -m 'Added a file'</userinput> </screen> +<!-- END daily.copy.init -->
--- a/en/examples/results/daily.copy.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN daily.copy.merge --> <screen><prompt>$</prompt> <userinput>hg pull ../my-copy</userinput> pulling from ../my-copy searching for changes @@ -14,3 +15,4 @@ line new contents </screen> +<!-- END daily.copy.merge -->
--- a/en/examples/results/daily.copy.other.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.other.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- BEGIN daily.copy.other --> <screen><prompt>$</prompt> <userinput>cd ../your-copy</userinput> <prompt>$</prompt> <userinput>echo 'new contents' >> file</userinput> <prompt>$</prompt> <userinput>hg commit -m 'Changed file'</userinput> </screen> +<!-- END daily.copy.other -->
--- a/en/examples/results/daily.copy.simple.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.simple.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- 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 -->
--- a/en/examples/results/daily.copy.status-copy.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.status-copy.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- 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 -->
--- a/en/examples/results/daily.copy.status.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.status.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- BEGIN daily.copy.status --> <screen><prompt>$</prompt> <userinput>hg status</userinput> A new-file </screen> +<!-- END daily.copy.status -->
--- a/en/examples/results/daily.files.add-dir.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.add-dir.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN daily.files.add-dir --> <screen><prompt>$</prompt> <userinput>mkdir b</userinput> <prompt>$</prompt> <userinput>echo b > b/b</userinput> <prompt>$</prompt> <userinput>echo c > b/c</userinput> @@ -9,3 +10,4 @@ adding b/d/d <prompt>$</prompt> <userinput>hg commit -m 'Added all files in subdirectory'</userinput> </screen> +<!-- END daily.files.add-dir -->
--- a/en/examples/results/daily.files.add.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.add.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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 > a</userinput> @@ -9,3 +10,4 @@ <prompt>$</prompt> <userinput>hg commit -m 'Added one file'</userinput> <prompt>$</prompt> <userinput>hg status</userinput> </screen> +<!-- END daily.files.add -->
--- a/en/examples/results/daily.files.addremove.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.addremove.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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 > a</userinput> @@ -6,3 +7,4 @@ adding a adding b </screen> +<!-- END daily.files.addremove -->
--- a/en/examples/results/daily.files.commit-addremove.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.commit-addremove.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- BEGIN daily.files.commit-addremove --> <screen><prompt>$</prompt> <userinput>echo c > c</userinput> <prompt>$</prompt> <userinput>hg commit -A -m 'Commit with addremove'</userinput> adding c </screen> +<!-- END daily.files.commit-addremove -->
--- a/en/examples/results/daily.files.hidden.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.hidden.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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> @@ -13,3 +14,4 @@ empty <prompt>$</prompt> <userinput>ls tmp/empty</userinput> </screen> +<!-- END daily.files.hidden -->
--- a/en/examples/results/daily.files.missing.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.missing.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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 > a</userinput> @@ -7,3 +8,4 @@ <prompt>$</prompt> <userinput>hg status</userinput> ! a </screen> +<!-- END daily.files.missing -->
--- a/en/examples/results/daily.files.recover-missing.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.recover-missing.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- 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 -->
--- a/en/examples/results/daily.files.remove-after.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.remove-after.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- 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 -->
--- a/en/examples/results/daily.files.remove.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.remove.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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 > a</userinput> @@ -12,3 +13,4 @@ <prompt>$</prompt> <userinput>hg remove b</userinput> removing b/b </screen> +<!-- END daily.files.remove -->
--- a/en/examples/results/daily.rename.rename.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.rename.rename.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,2 +1,4 @@ +<!-- BEGIN daily.rename.rename --> <screen><prompt>$</prompt> <userinput>hg rename a b</userinput> </screen> +<!-- END daily.rename.rename -->
--- a/en/examples/results/daily.rename.status-copy.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.rename.status-copy.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- BEGIN daily.rename.status-copy --> <screen><prompt>$</prompt> <userinput>hg status -C</userinput> A b a R a </screen> +<!-- END daily.rename.status-copy -->
--- a/en/examples/results/daily.rename.status.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.rename.status.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- BEGIN daily.rename.status --> <screen><prompt>$</prompt> <userinput>hg status</userinput> A b R a </screen> +<!-- END daily.rename.status -->
--- a/en/examples/results/daily.revert.add.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.add.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN daily.revert.add --> <screen><prompt>$</prompt> <userinput>echo oops > oops</userinput> <prompt>$</prompt> <userinput>hg add oops</userinput> <prompt>$</prompt> <userinput>hg status oops</userinput> @@ -6,3 +7,4 @@ <prompt>$</prompt> <userinput>hg status</userinput> ? oops </screen> +<!-- END daily.revert.add -->
--- a/en/examples/results/daily.revert.copy.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.copy.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- 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 -->
--- a/en/examples/results/daily.revert.missing.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.missing.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN daily.revert.missing --> <screen><prompt>$</prompt> <userinput>rm file</userinput> <prompt>$</prompt> <userinput>hg status</userinput> ! file @@ -5,3 +6,4 @@ <prompt>$</prompt> <userinput>ls file</userinput> file </screen> +<!-- END daily.revert.missing -->
--- a/en/examples/results/daily.revert.modify.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.modify.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN daily.revert.modify --> <screen><prompt>$</prompt> <userinput>cat file</userinput> original content <prompt>$</prompt> <userinput>echo unwanted change >> file</userinput> @@ -9,3 +10,4 @@ original content +unwanted change </screen> +<!-- END daily.revert.modify -->
--- a/en/examples/results/daily.revert.remove.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.remove.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN daily.revert.remove --> <screen><prompt>$</prompt> <userinput>hg remove file</userinput> <prompt>$</prompt> <userinput>hg status</userinput> R file @@ -6,3 +7,4 @@ <prompt>$</prompt> <userinput>ls file</userinput> file </screen> +<!-- END daily.revert.remove -->
--- a/en/examples/results/daily.revert.rename-orig.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.rename-orig.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- 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 -->
--- a/en/examples/results/daily.revert.rename.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.rename.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- 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 -->
--- a/en/examples/results/daily.revert.status.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.status.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ +<!-- 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 -->
--- a/en/examples/results/daily.revert.unmodify.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.unmodify.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ +<!-- 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 -->
--- a/en/examples/results/extdiff.diff.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/extdiff.diff.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN extdiff.diff --> <screen><prompt>$</prompt> <userinput>hg diff</userinput> diff -r myfile @@ -6,3 +7,4 @@ The first line. +The second line. </screen> +<!-- END extdiff.diff -->
--- a/en/examples/results/extdiff.extdiff-ctx.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/extdiff.extdiff-ctx.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN extdiff.extdiff-ctx --> <screen><prompt>$</prompt> <userinput>hg extdiff -o -NprcC5</userinput> @@ -7,3 +8,4 @@ The first line. + The second line. </screen> +<!-- END extdiff.extdiff-ctx -->
--- a/en/examples/results/extdiff.extdiff.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/extdiff.extdiff.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN extdiff.extdiff --> <screen><prompt>$</prompt> <userinput>hg extdiff</userinput> @@ -5,3 +6,4 @@ The first line. +The second line. </screen> +<!-- END extdiff.extdiff -->
--- a/en/examples/results/filenames.dirs.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.dirs.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ +<!-- 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 -->
--- a/en/examples/results/filenames.files.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.files.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,2 +1,4 @@ +<!-- BEGIN filenames.files --> <screen><prompt>$</prompt> <userinput>hg add COPYING README examples/simple.py</userinput> </screen> +<!-- END filenames.files -->
--- a/en/examples/results/filenames.filter.exclude.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.filter.exclude.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- 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 -->
--- a/en/examples/results/filenames.filter.include.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.filter.include.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- BEGIN filenames.filter.include --> <screen><prompt>$</prompt> <userinput>hg status -I '*.in'</userinput> ? MANIFEST.in </screen> +<!-- END filenames.filter.include -->
--- a/en/examples/results/filenames.glob.group.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.glob.group.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- BEGIN filenames.glob.group --> <screen><prompt>$</prompt> <userinput>hg status 'glob:*.{in,py}'</userinput> ? MANIFEST.in ? setup.py </screen> +<!-- END filenames.glob.group -->
--- a/en/examples/results/filenames.glob.question.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.glob.question.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- BEGIN filenames.glob.question --> <screen><prompt>$</prompt> <userinput>hg status 'glob:**.?'</userinput> ? src/watcher/_watcher.c </screen> +<!-- END filenames.glob.question -->
--- a/en/examples/results/filenames.glob.range.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.glob.range.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- BEGIN filenames.glob.range --> <screen><prompt>$</prompt> <userinput>hg status 'glob:**[nr-t]'</userinput> ? MANIFEST.in ? src/xyzzy.txt </screen> +<!-- END filenames.glob.range -->
--- a/en/examples/results/filenames.glob.star-starstar.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.glob.star-starstar.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN filenames.glob.star-starstar --> <screen><prompt>$</prompt> <userinput>hg status 'glob:*.py'</userinput> ? setup.py <prompt>$</prompt> <userinput>hg status 'glob:**.py'</userinput> @@ -7,3 +8,4 @@ ? setup.py ? src/watcher/watcher.py </screen> +<!-- END filenames.glob.star-starstar -->
--- a/en/examples/results/filenames.glob.star.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.glob.star.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- BEGIN filenames.glob.star --> <screen><prompt>$</prompt> <userinput>hg add 'glob:*.py'</userinput> adding main.py </screen> +<!-- END filenames.glob.star -->
--- a/en/examples/results/filenames.glob.starstar.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.glob.starstar.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN filenames.glob.starstar --> <screen><prompt>$</prompt> <userinput>cd ..</userinput> <prompt>$</prompt> <userinput>hg status 'glob:**.py'</userinput> A examples/simple.py @@ -6,3 +7,4 @@ ? setup.py ? src/watcher/watcher.py </screen> +<!-- END filenames.glob.starstar -->
--- a/en/examples/results/filenames.wdir-relname.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.wdir-relname.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN filenames.wdir-relname --> <screen><prompt>$</prompt> <userinput>hg status</userinput> A COPYING A README @@ -21,3 +22,4 @@ ? watcher/watcher.py ? xyzzy.txt </screen> +<!-- END filenames.wdir-relname -->
--- a/en/examples/results/filenames.wdir-subdir.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.wdir-subdir.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN filenames.wdir-subdir --> <screen><prompt>$</prompt> <userinput>cd src</userinput> <prompt>$</prompt> <userinput>hg add -n</userinput> adding ../MANIFEST.in @@ -13,3 +14,4 @@ adding watcher/watcher.py adding xyzzy.txt </screen> +<!-- END filenames.wdir-subdir -->
--- a/en/examples/results/hook.msglen.go.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/hook.msglen.go.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN hook.msglen.go --> <screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput> [hooks] pretxncommit.msglen = test `hg tip --template {desc} | wc -c` -ge 10 @@ -9,3 +10,4 @@ abort: pretxncommit.msglen hook exited with status 1 <prompt>$</prompt> <userinput>hg commit -A -m 'long enough'</userinput> </screen> +<!-- END hook.msglen.go -->
--- a/en/examples/results/hook.simple.ext.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/hook.simple.ext.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ +<!-- BEGIN hook.simple.ext --> <screen><prompt>$</prompt> <userinput>echo 'commit.when = echo -n "date of commit: "; date' >> .hg/hgrc</userinput> <prompt>$</prompt> <userinput>echo a >> a</userinput> <prompt>$</prompt> <userinput>hg commit -m 'i have two hooks'</userinput> committed </screen> +<!-- END hook.simple.ext -->
--- a/en/examples/results/hook.simple.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/hook.simple.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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]' >> .hg/hgrc</userinput> @@ -10,3 +11,4 @@ <prompt>$</prompt> <userinput>hg commit -m 'testing commit hook'</userinput> committed </screen> +<!-- END hook.simple.init -->
--- a/en/examples/results/hook.simple.pretxncommit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/hook.simple.pretxncommit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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 @@ -12,3 +13,4 @@ committed </screen> +<!-- END hook.simple.pretxncommit -->
--- a/en/examples/results/hook.ws.better.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/hook.ws.better.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN hook.ws.better --> <screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput> [hooks] pretxncommit.whitespace = .hg/check_whitespace.py @@ -16,3 +17,4 @@ rollback completed abort: pretxncommit.whitespace hook exited with status 1 </screen> +<!-- END hook.ws.better -->
--- a/en/examples/results/hook.ws.simple.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/hook.ws.simple.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN hook.ws.simple --> <screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput> [hooks] pretxncommit.whitespace = hg export tip | (! egrep -q '^\+.*[ \t]$') @@ -10,3 +11,4 @@ <prompt>$</prompt> <userinput>echo 'a' > a</userinput> <prompt>$</prompt> <userinput>hg commit -A -m 'drop trailing whitespace and try again'</userinput> </screen> +<!-- END hook.ws.simple -->
--- a/en/examples/results/issue29.go.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/issue29.go.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN issue29.go --> <screen><prompt>$</prompt> <userinput>hg init issue29</userinput> <prompt>$</prompt> <userinput>cd issue29</userinput> <prompt>$</prompt> <userinput>echo a > a</userinput> @@ -16,3 +17,4 @@ <prompt>$</prompt> <userinput>hg merge</userinput> </screen> +<!-- END issue29.go -->
--- a/en/examples/results/mq.dodiff.diff.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.dodiff.diff.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN mq.dodiff.diff --> <screen><prompt>$</prompt> <userinput>echo 'this is my original thought' > oldfile</userinput> <prompt>$</prompt> <userinput>echo 'i have changed my mind' > newfile</userinput> <prompt>$</prompt> <userinput>diff -u oldfile newfile > tiny.patch</userinput> @@ -12,3 +13,4 @@ <prompt>$</prompt> <userinput>cat oldfile</userinput> i have changed my mind </screen> +<!-- END mq.dodiff.diff -->
--- a/en/examples/results/mq.guards.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN mq.guards.init --> <screen><prompt>$</prompt> <userinput>hg qinit</userinput> <prompt>$</prompt> <userinput>hg qnew hello.patch</userinput> <prompt>$</prompt> <userinput>echo hello > hello</userinput> @@ -8,3 +9,4 @@ <prompt>$</prompt> <userinput>hg add goodbye</userinput> <prompt>$</prompt> <userinput>hg qrefresh</userinput> </screen> +<!-- END mq.guards.init -->
--- a/en/examples/results/mq.guards.qguard.neg.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qguard.neg.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,30 @@ +<!-- 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 -->
--- a/en/examples/results/mq.guards.qguard.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qguard.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- BEGIN mq.guards.qguard --> <screen><prompt>$</prompt> <userinput>hg qguard</userinput> goodbye.patch: unguarded </screen> +<!-- END mq.guards.qguard -->
--- a/en/examples/results/mq.guards.qguard.pos.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qguard.pos.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- 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 -->
--- a/en/examples/results/mq.guards.qselect.cat.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qselect.cat.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- BEGIN mq.guards.qselect.cat --> <screen><prompt>$</prompt> <userinput>cat .hg/patches/guards</userinput> foo </screen> +<!-- END mq.guards.qselect.cat -->
--- a/en/examples/results/mq.guards.qselect.error.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qselect.error.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- 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 -->
--- a/en/examples/results/mq.guards.qselect.foo.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qselect.foo.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN mq.guards.qselect.foo --> <screen><prompt>$</prompt> <userinput>hg qpop -a</userinput> patch queue now empty <prompt>$</prompt> <userinput>hg qselect</userinput> @@ -7,3 +8,4 @@ <prompt>$</prompt> <userinput>hg qselect</userinput> foo </screen> +<!-- END mq.guards.qselect.foo -->
--- a/en/examples/results/mq.guards.qselect.foobar.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qselect.foobar.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,9 +1,11 @@ +<!-- 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 -->
--- a/en/examples/results/mq.guards.qselect.qpush.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qselect.qpush.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- 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 -->
--- a/en/examples/results/mq.guards.qselect.quux.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qselect.quux.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,7 +1,11 @@ +<!-- 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 -->
--- a/en/examples/results/mq.guards.series.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.series.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- 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 -->
--- a/en/examples/results/mq.id.output.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.id.output.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN mq.id.output --> <screen><prompt>$</prompt> <userinput>hg qapplied</userinput> first.patch second.patch @@ -31,3 +32,4 @@ @@ -0,0 +1,1 @@ +double u; </screen> +<!-- END mq.id.output -->
--- a/en/examples/results/mq.qinit-help.help.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.qinit-help.help.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN mq.qinit-help.help --> <screen><prompt>$</prompt> <userinput>hg help qinit</userinput> hg qinit [-c] @@ -15,3 +16,4 @@ use "hg -v help qinit" to show global options </screen> +<!-- END mq.qinit-help.help -->
--- a/en/examples/results/mq.tarball.download.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tarball.download.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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> @@ -8,3 +9,4 @@ updating working directory 18 files updated, 0 files merged, 0 files removed, 0 files unresolved </screen> +<!-- END mq.tarball.download -->
--- a/en/examples/results/mq.tarball.newsource.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tarball.newsource.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN mq.tarball.newsource --> <screen><prompt>$</prompt> <userinput>hg qpop -a</userinput> patch queue now empty <prompt>$</prompt> <userinput>cd ..</userinput> @@ -12,3 +13,4 @@ <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 -->
--- a/en/examples/results/mq.tarball.qinit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tarball.qinit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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> @@ -27,3 +28,4 @@ do_log(LOG_ERR, "Could not get socket details: %m"); </screen> +<!-- END mq.tarball.qinit -->
--- a/en/examples/results/mq.tarball.repush.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tarball.repush.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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 @@ -12,3 +13,4 @@ applying build-fix.patch now at: build-fix.patch </screen> +<!-- END mq.tarball.repush -->
--- a/en/examples/results/mq.tools.lsdiff.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tools.lsdiff.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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) @@ -20,3 +21,4 @@ 178 File #8 a/drivers/video/au1100fb.c 180 Hunk #1 void __exit au1100fb_cleanup(void) </screen> +<!-- END mq.tools.lsdiff -->
--- a/en/examples/results/mq.tools.tools.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tools.tools.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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 +++++------ @@ -22,3 +23,4 @@ module_init(au1100fb_init); </screen> +<!-- END mq.tools.tools -->
--- a/en/examples/results/mq.tutorial.add.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.add.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- BEGIN mq.tutorial.add --> <screen><prompt>$</prompt> <userinput>echo 'file 3, line 1' >> 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 -->
--- a/en/examples/results/mq.tutorial.qinit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qinit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- 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' > file1</userinput> @@ -6,3 +7,4 @@ <prompt>$</prompt> <userinput>hg commit -m'first change'</userinput> <prompt>$</prompt> <userinput>hg qinit</userinput> </screen> +<!-- END mq.tutorial.qinit -->
--- a/en/examples/results/mq.tutorial.qnew.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qnew.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN mq.tutorial.qnew --> <screen><prompt>$</prompt> <userinput>hg tip</userinput> changeset: tag: tip @@ -19,3 +20,4 @@ <prompt>$</prompt> <userinput>ls .hg/patches</userinput> first.patch series status </screen> +<!-- END mq.tutorial.qnew -->
--- a/en/examples/results/mq.tutorial.qnew2.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qnew2.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,15 +1,16 @@ +<!-- 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' >> 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 @@ -27,3 +28,4 @@ 1: line 3 2: line 4 </screen> +<!-- END mq.tutorial.qnew2 -->
--- a/en/examples/results/mq.tutorial.qpop.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qpop.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN mq.tutorial.qpop --> <screen><prompt>$</prompt> <userinput>hg qapplied</userinput> first.patch second.patch @@ -13,3 +14,4 @@ line 2 line 3 </screen> +<!-- END mq.tutorial.qpop -->
--- a/en/examples/results/mq.tutorial.qpush-a.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qpush-a.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN mq.tutorial.qpush-a --> <screen><prompt>$</prompt> <userinput>hg qpush -a</userinput> applying second.patch now at: second.patch @@ -7,3 +8,4 @@ line 3 line 4 </screen> +<!-- END mq.tutorial.qpush-a -->
--- a/en/examples/results/mq.tutorial.qrefresh.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qrefresh.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN mq.tutorial.qrefresh --> <screen><prompt>$</prompt> <userinput>echo 'line 2' >> file1</userinput> <prompt>$</prompt> <userinput>hg diff</userinput> diff -r file1 @@ -9,7 +10,7 @@ <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 @@ -20,3 +21,4 @@ +line 2 </screen> +<!-- END mq.tutorial.qrefresh -->
--- a/en/examples/results/mq.tutorial.qrefresh2.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qrefresh2.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,9 +1,10 @@ +<!-- BEGIN mq.tutorial.qrefresh2 --> <screen><prompt>$</prompt> <userinput>echo 'line 3' >> 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 @@ -15,3 +16,4 @@ +line 3 </screen> +<!-- END mq.tutorial.qrefresh2 -->
--- a/en/examples/results/mq.tutorial.qseries.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qseries.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN mq.tutorial.qseries --> <screen><prompt>$</prompt> <userinput>hg qseries</userinput> first.patch second.patch @@ -5,3 +6,4 @@ first.patch second.patch </screen> +<!-- END mq.tutorial.qseries -->
--- a/en/examples/results/rename.divergent.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rename.divergent.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN rename.divergent.clone --> <screen><prompt>$</prompt> <userinput>hg clone orig anne</userinput> updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -5,3 +6,4 @@ updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved </screen> +<!-- END rename.divergent.clone -->
--- a/en/examples/results/rename.divergent.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rename.divergent.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN rename.divergent.merge --> <screen># See http://www.selenic.com/mercurial/bts/issue455 <prompt>$</prompt> <userinput>cd ../orig</userinput> <prompt>$</prompt> <userinput>hg pull -u ../anne</userinput> @@ -25,3 +26,4 @@ <prompt>$</prompt> <userinput>ls</userinput> bar quux </screen> +<!-- END rename.divergent.merge -->
--- a/en/examples/results/rename.divergent.rename.anne.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rename.divergent.rename.anne.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- BEGIN rename.divergent.rename.anne --> <screen><prompt>$</prompt> <userinput>cd anne</userinput> <prompt>$</prompt> <userinput>hg mv foo bar</userinput> <prompt>$</prompt> <userinput>hg ci -m 'Rename foo to bar'</userinput> </screen> +<!-- END rename.divergent.rename.anne -->
--- a/en/examples/results/rename.divergent.rename.bob.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rename.divergent.rename.bob.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- BEGIN rename.divergent.rename.bob --> <screen><prompt>$</prompt> <userinput>cd ../bob</userinput> <prompt>$</prompt> <userinput>hg mv foo quux</userinput> <prompt>$</prompt> <userinput>hg ci -m 'Rename foo to quux'</userinput> </screen> +<!-- END rename.divergent.rename.bob -->
--- a/en/examples/results/rollback.add.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rollback.add.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- BEGIN rollback.add --> <screen><prompt>$</prompt> <userinput>hg add b</userinput> <prompt>$</prompt> <userinput>hg commit -m 'Add file b, this time for real'</userinput> </screen> +<!-- END rollback.add -->
--- a/en/examples/results/rollback.commit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rollback.commit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- BEGIN rollback.commit --> <screen><prompt>$</prompt> <userinput>hg status</userinput> M a <prompt>$</prompt> <userinput>echo b > b</userinput> <prompt>$</prompt> <userinput>hg commit -m 'Add file b'</userinput> </screen> +<!-- END rollback.commit -->
--- a/en/examples/results/rollback.rollback.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rollback.rollback.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN rollback.rollback --> <screen><prompt>$</prompt> <userinput>hg rollback</userinput> rolling back last transaction <prompt>$</prompt> <userinput>hg tip</userinput> @@ -11,3 +12,4 @@ M a ? b </screen> +<!-- END rollback.rollback -->
--- a/en/examples/results/rollback.status.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rollback.status.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN rollback.status --> <screen><prompt>$</prompt> <userinput>hg status</userinput> ? b <prompt>$</prompt> <userinput>hg tip</userinput> @@ -8,3 +9,4 @@ summary: Add file b </screen> +<!-- END rollback.status -->
--- a/en/examples/results/rollback.tip.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rollback.tip.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,1 +1,3 @@ +<!-- BEGIN rollback.tip --> <screen></screen> +<!-- END rollback.tip -->
--- a/en/examples/results/rollback.twice.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rollback.twice.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- BEGIN rollback.twice --> <screen><prompt>$</prompt> <userinput>hg rollback</userinput> rolling back last transaction <prompt>$</prompt> <userinput>hg rollback</userinput> no rollback information available </screen> +<!-- END rollback.twice -->
--- a/en/examples/results/tag.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ +<!-- BEGIN tag.init --> <screen><prompt>$</prompt> <userinput>hg init mytag</userinput> <prompt>$</prompt> <userinput>cd mytag</userinput> <prompt>$</prompt> <userinput>echo hello > myfile</userinput> <prompt>$</prompt> <userinput>hg commit -A -m 'Initial commit'</userinput> adding myfile </screen> +<!-- END tag.init -->
--- a/en/examples/results/tag.log.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.log.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tag.log --> <screen><prompt>$</prompt> <userinput>hg log</userinput> changeset: tag: tip @@ -12,3 +13,4 @@ summary: Initial commit </screen> +<!-- END tag.log -->
--- a/en/examples/results/tag.log.v1.0.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.log.v1.0.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tag.log.v1.0 --> <screen><prompt>$</prompt> <userinput>echo goodbye > myfile2</userinput> <prompt>$</prompt> <userinput>hg commit -A -m 'Second commit'</userinput> adding myfile2 @@ -9,3 +10,4 @@ summary: Initial commit </screen> +<!-- END tag.log.v1.0 -->
--- a/en/examples/results/tag.remove.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.remove.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- BEGIN tag.remove --> <screen><prompt>$</prompt> <userinput>hg tag --remove v1.0</userinput> <prompt>$</prompt> <userinput>hg tags</userinput> tip </screen> +<!-- END tag.remove -->
--- a/en/examples/results/tag.replace.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.replace.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tag.replace --> <screen><prompt>$</prompt> <userinput>hg tag -r 1 v1.1</userinput> <prompt>$</prompt> <userinput>hg tags</userinput> tip @@ -9,3 +10,4 @@ tip v1.1 </screen> +<!-- END tag.replace -->
--- a/en/examples/results/tag.tag.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.tag.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,2 +1,4 @@ +<!-- BEGIN tag.tag --> <screen><prompt>$</prompt> <userinput>hg tag v1.0</userinput> </screen> +<!-- END tag.tag -->
--- a/en/examples/results/tag.tags.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.tags.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- BEGIN tag.tags --> <screen><prompt>$</prompt> <userinput>hg tags</userinput> tip v1.0 </screen> +<!-- END tag.tags -->
--- a/en/examples/results/tag.tip.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.tip.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tag.tip --> <screen><prompt>$</prompt> <userinput>hg tip</userinput> changeset: tag: tip @@ -6,3 +7,4 @@ summary: Added tag v1.1 for changeset </screen> +<!-- END tag.tip -->
--- a/en/examples/results/template.simple.changelog.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.changelog.out Tue Mar 31 12:19:01 2009 -0700 @@ -21,3 +21,5 @@ + +
--- a/en/examples/results/template.simple.combine.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.combine.out Tue Mar 31 12:19:01 2009 -0700 @@ -5,3 +5,5 @@ + +
--- a/en/examples/results/template.simple.compact.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.compact.out Tue Mar 31 12:19:01 2009 -0700 @@ -12,3 +12,5 @@ + +
--- a/en/examples/results/template.simple.datekeyword.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.datekeyword.out Tue Mar 31 12:19:01 2009 -0700 @@ -3,3 +3,5 @@ + +
--- a/en/examples/results/template.simple.keywords.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.keywords.out Tue Mar 31 12:19:01 2009 -0700 @@ -20,3 +20,5 @@ + +
--- a/en/examples/results/template.simple.manyfilters.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.manyfilters.out Tue Mar 31 12:19:01 2009 -0700 @@ -61,3 +61,5 @@ + +
--- a/en/examples/results/template.simple.normal.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.normal.out Tue Mar 31 12:19:01 2009 -0700 @@ -6,3 +6,5 @@ + +
--- a/en/examples/results/template.simple.rev.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.rev.out Tue Mar 31 12:19:01 2009 -0700 @@ -2,3 +2,5 @@ + +
--- a/en/examples/results/template.simple.simplest.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.simplest.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + +
--- a/en/examples/results/template.simple.simplesub.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.simplesub.out Tue Mar 31 12:19:01 2009 -0700 @@ -6,3 +6,5 @@ + +
--- a/en/examples/results/template.svnstyle.id.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.id.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,2 +1,4 @@ +<!-- BEGIN template.svnstyle.id --> <screen><prompt>$</prompt> <userinput>hg log -r0 --template '{node}'</userinput> </screen> +<!-- END template.svnstyle.id -->
--- a/en/examples/results/template.svnstyle.result.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.result.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN template.svnstyle.result --> <screen><prompt>$</prompt> <userinput>hg log -r1 --style svn.style</userinput> ------------------------------------------------------------------------ @@ -10,3 +11,4 @@ ------------------------------------------------------------------------ </screen> +<!-- END template.svnstyle.result -->
--- a/en/examples/results/template.svnstyle.short.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.short.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN template.svnstyle.short --> <screen><prompt>$</prompt> <userinput>svn log -r9653</userinput> ------------------------------------------------------------------------ r9653 | sean.hefty | 2006-09-27 14:39:55 -0700 (Wed, 27 Sep 2006) | 5 lines @@ -9,3 +10,4 @@ ------------------------------------------------------------------------ </screen> +<!-- END template.svnstyle.short -->
--- a/en/examples/results/template.svnstyle.simplest.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.simplest.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- BEGIN template.svnstyle.simplest --> <screen><prompt>$</prompt> <userinput>cat svn.style</userinput> changeset = "{node|short}\n" <prompt>$</prompt> <userinput>hg log -r1 --style svn.style</userinput> </screen> +<!-- END template.svnstyle.simplest -->
--- a/en/examples/results/template.svnstyle.style.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.style.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- BEGIN template.svnstyle.style --> <screen><prompt>$</prompt> <userinput>cat svn.style</userinput> header = '------------------------------------------------------------------------\n\n' changeset = svn.template </screen> +<!-- END template.svnstyle.style -->
--- a/en/examples/results/template.svnstyle.syntax.error.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.syntax.error.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- BEGIN template.svnstyle.syntax.error --> <screen><prompt>$</prompt> <userinput>hg log -r1 --style broken.style</userinput> abort: broken.style:1: parse error </screen> +<!-- END template.svnstyle.syntax.error -->
--- a/en/examples/results/template.svnstyle.syntax.input.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.syntax.input.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- BEGIN template.svnstyle.syntax.input --> <screen><prompt>$</prompt> <userinput>cat broken.style</userinput> changeset = </screen> +<!-- END template.svnstyle.syntax.input -->
--- a/en/examples/results/template.svnstyle.template.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.template.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN template.svnstyle.template --> <screen><prompt>$</prompt> <userinput>cat svn.template</userinput> r{rev} | {author|user} | {date|isodate} ({date|rfc822date}) @@ -5,3 +6,4 @@ ------------------------------------------------------------------------ </screen> +<!-- END template.svnstyle.template -->
--- a/en/examples/results/tour-merge-conflict.commit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour-merge-conflict.commit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour-merge-conflict.commit --> <screen><prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput> <prompt>></prompt> <userinput>Greetings!</userinput> <prompt>></prompt> <userinput>I am Bryan O'Sullivan, no relation of the former</userinput> @@ -15,3 +16,4 @@ summary: Send me your money </screen> +<!-- END tour-merge-conflict.commit -->
--- a/en/examples/results/tour-merge-conflict.cousin.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour-merge-conflict.cousin.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour-merge-conflict.cousin --> <screen><prompt>$</prompt> <userinput>cd ..</userinput> <prompt>$</prompt> <userinput>hg clone scam scam-cousin</userinput> updating working directory @@ -10,3 +11,4 @@ <prompt>></prompt> <userinput>EOF</userinput> <prompt>$</prompt> <userinput>hg commit -m '419 scam, with cousin'</userinput> </screen> +<!-- END tour-merge-conflict.cousin -->
--- a/en/examples/results/tour-merge-conflict.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour-merge-conflict.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour-merge-conflict.merge --> <screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput> <prompt>$</prompt> <userinput>echo 'XXX this is broken and must be fixed'</userinput> XXX this is broken and must be fixed @@ -6,13 +7,14 @@ 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 +use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon <prompt>$</prompt> <userinput>cat letter.txt</userinput> Greetings! -<<<<<<< /tmp/tour-merge-conflictBrdfE0/scam-merge/letter.txt +<<<<<<< /tmp/tour-merge-conflictP17yO-/scam-merge/letter.txt I am Shehu Musa Abacha, cousin to the former ======= I am Alhaji Abba Abacha, son of the former ->>>>>>> /tmp/letter.txt~other.1ctEYy +>>>>>>> /tmp/letter.txt~other.EVdwH3 Nigerian dictator Sani Abacha. </screen> +<!-- END tour-merge-conflict.merge -->
--- a/en/examples/results/tour-merge-conflict.pull.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour-merge-conflict.pull.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour-merge-conflict.pull --> <screen><prompt>$</prompt> <userinput>cd ..</userinput> <prompt>$</prompt> <userinput>hg clone scam-cousin scam-merge</userinput> updating working directory @@ -13,3 +14,4 @@ not updating, since new heads added (run 'hg heads' to see heads, 'hg merge' to merge) </screen> +<!-- END tour-merge-conflict.pull -->
--- a/en/examples/results/tour-merge-conflict.son.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour-merge-conflict.son.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour-merge-conflict.son --> <screen><prompt>$</prompt> <userinput>cd ..</userinput> <prompt>$</prompt> <userinput>hg clone scam scam-son</userinput> updating working directory @@ -10,3 +11,4 @@ <prompt>></prompt> <userinput>EOF</userinput> <prompt>$</prompt> <userinput>hg commit -m '419 scam, with son'</userinput> </screen> +<!-- END tour-merge-conflict.son -->
--- a/en/examples/results/tour-merge-conflict.wife.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour-merge-conflict.wife.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour-merge-conflict.wife --> <screen><prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput> <prompt>></prompt> <userinput>Greetings!</userinput> <prompt>></prompt> <userinput>I am Mariam Abacha, the wife of former</userinput> @@ -6,3 +7,4 @@ <prompt>$</prompt> <userinput>hg add letter.txt</userinput> <prompt>$</prompt> <userinput>hg commit -m '419 scam, first draft'</userinput> </screen> +<!-- END tour-merge-conflict.wife -->
--- a/en/examples/results/tour.clone-pull.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.clone-pull.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- BEGIN tour.clone-pull --> <screen><prompt>$</prompt> <userinput>cd ..</userinput> <prompt>$</prompt> <userinput>hg clone hello hello-pull</userinput> updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved </screen> +<!-- END tour.clone-pull -->
--- a/en/examples/results/tour.clone-push.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.clone-push.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- BEGIN tour.clone-push --> <screen><prompt>$</prompt> <userinput>cd ..</userinput> <prompt>$</prompt> <userinput>hg clone hello hello-push</userinput> updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved </screen> +<!-- END tour.clone-push -->
--- a/en/examples/results/tour.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.clone --> <screen><prompt>$</prompt> <userinput>hg clone http://hg.serpentine.com/tutorial/hello</userinput> destination directory: hello requesting all changes @@ -8,3 +9,4 @@ updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved </screen> +<!-- END tour.clone -->
--- a/en/examples/results/tour.commit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.commit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,2 +1,4 @@ +<!-- BEGIN tour.commit --> <screen><prompt>$</prompt> <userinput>hg commit</userinput> </screen> +<!-- END tour.commit -->
--- a/en/examples/results/tour.diff.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.diff.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.diff --> <screen><prompt>$</prompt> <userinput>hg diff</userinput> diff -r hello.c @@ -10,3 +11,4 @@ return 0; } </screen> +<!-- END tour.diff -->
--- a/en/examples/results/tour.help.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.help.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.help --> <screen><prompt>$</prompt> <userinput>hg help init</userinput> hg init [-e CMD] [--remotecmd CMD] [DEST] @@ -18,3 +19,4 @@ use "hg -v help init" to show global options </screen> +<!-- END tour.help -->
--- a/en/examples/results/tour.incoming.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.incoming.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.incoming --> <screen><prompt>$</prompt> <userinput>cd hello-pull</userinput> <prompt>$</prompt> <userinput>hg incoming ../my-hello</userinput> comparing with ../my-hello @@ -9,3 +10,4 @@ summary: Added an extra line of output </screen> +<!-- END tour.incoming -->
--- a/en/examples/results/tour.log-r.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.log-r.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.log-r --> <screen><prompt>$</prompt> <userinput>hg log -r 3</userinput> changeset: user: Bryan O'Sullivan <bos@serpentine.com> @@ -23,3 +24,4 @@ summary: Trim comments. </screen> +<!-- END tour.log-r -->
--- a/en/examples/results/tour.log-v.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.log-v.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.log-v --> <screen><prompt>$</prompt> <userinput>hg log -v -r 3</userinput> changeset: user: Bryan O'Sullivan <bos@serpentine.com> @@ -8,3 +9,4 @@ </screen> +<!-- END tour.log-v -->
--- a/en/examples/results/tour.log-vp.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.log-vp.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.log-vp --> <screen><prompt>$</prompt> <userinput>hg log -v -p -r 2</userinput> changeset: user: Bryan O'Sullivan <bos@serpentine.com> @@ -20,3 +21,4 @@ } </screen> +<!-- END tour.log-vp -->
--- a/en/examples/results/tour.log.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.log.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.log --> <screen><prompt>$</prompt> <userinput>hg log</userinput> changeset: tag: tip @@ -26,3 +27,4 @@ summary: Create a standard "hello, world" program </screen> +<!-- END tour.log -->
--- a/en/examples/results/tour.log.range.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.log.range.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.log.range --> <screen><prompt>$</prompt> <userinput>hg log -r 2:4</userinput> changeset: user: Bryan O'Sullivan <bos@serpentine.com> @@ -16,3 +17,4 @@ summary: Trim comments. </screen> +<!-- END tour.log.range -->
--- a/en/examples/results/tour.ls-a.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.ls-a.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ +<!-- BEGIN tour.ls-a --> <screen><prompt>$</prompt> <userinput>cd hello</userinput> <prompt>$</prompt> <userinput>ls -a</userinput> . .. .hg Makefile hello.c </screen> +<!-- END tour.ls-a -->
--- a/en/examples/results/tour.ls.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.ls.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ +<!-- BEGIN tour.ls --> <screen><prompt>$</prompt> <userinput>ls -l</userinput> <prompt>$</prompt> <userinput>ls hello</userinput> Makefile hello.c </screen> +<!-- END tour.ls -->
--- a/en/examples/results/tour.merge.cat.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.cat.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.merge.cat --> <screen><prompt>$</prompt> <userinput>cat hello.c</userinput> /* * Placed in the public domain by Bryan O'Sullivan. This program is @@ -27,3 +28,4 @@ return 0; } </screen> +<!-- END tour.merge.cat -->
--- a/en/examples/results/tour.merge.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.merge.clone --> <screen><prompt>$</prompt> <userinput>cd ..</userinput> <prompt>$</prompt> <userinput>hg clone hello my-new-hello</userinput> updating working directory @@ -6,3 +7,4 @@ <prompt>$</prompt> <userinput>sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c</userinput> <prompt>$</prompt> <userinput>hg commit -m 'A new hello for a new day.'</userinput> </screen> +<!-- END tour.merge.clone -->
--- a/en/examples/results/tour.merge.commit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.commit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,2 +1,4 @@ +<!-- BEGIN tour.merge.commit --> <screen><prompt>$</prompt> <userinput>hg commit -m 'Merged changes'</userinput> </screen> +<!-- END tour.merge.commit -->
--- a/en/examples/results/tour.merge.heads.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.heads.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.merge.heads --> <screen><prompt>$</prompt> <userinput>hg heads</userinput> changeset: tag: tip @@ -12,3 +13,4 @@ summary: A new hello for a new day. </screen> +<!-- END tour.merge.heads -->
--- a/en/examples/results/tour.merge.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- BEGIN tour.merge.merge --> <screen><prompt>$</prompt> <userinput>hg merge</userinput> merging hello.c 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) </screen> +<!-- END tour.merge.merge -->
--- a/en/examples/results/tour.merge.parents.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.parents.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.merge.parents --> <screen><prompt>$</prompt> <userinput>hg parents</userinput> changeset: user: Bryan O'Sullivan <bos@serpentine.com> @@ -27,3 +28,4 @@ return 0; } </screen> +<!-- END tour.merge.parents -->
--- a/en/examples/results/tour.merge.pull.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.pull.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.merge.pull --> <screen><prompt>$</prompt> <userinput>hg pull ../my-hello</userinput> pulling from ../my-hello searching for changes @@ -7,3 +8,4 @@ added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) </screen> +<!-- END tour.merge.pull -->
--- a/en/examples/results/tour.merge.tip.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.tip.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.merge.tip --> <screen><prompt>$</prompt> <userinput>hg tip</userinput> changeset: tag: tip @@ -8,3 +9,4 @@ summary: Merged changes </screen> +<!-- END tour.merge.tip -->
--- a/en/examples/results/tour.merge.update.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.update.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ +<!-- BEGIN tour.merge.update --> <screen><prompt>$</prompt> <userinput>hg update</userinput> abort: crosses branches (use 'hg merge' or 'hg update -C') </screen> +<!-- END tour.merge.update -->
--- a/en/examples/results/tour.older.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.older.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.older --> <screen><prompt>$</prompt> <userinput>hg update 2</userinput> 2 files updated, 0 files merged, 0 files removed, 0 files unresolved <prompt>$</prompt> <userinput>hg parents</userinput> @@ -9,3 +10,4 @@ <prompt>$</prompt> <userinput>hg update</userinput> 2 files updated, 0 files merged, 0 files removed, 0 files unresolved </screen> +<!-- END tour.older -->
--- a/en/examples/results/tour.outgoing.net.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.outgoing.net.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.outgoing.net --> <screen><prompt>$</prompt> <userinput>hg outgoing http://hg.serpentine.com/tutorial/hello</userinput> comparing with http://hg.serpentine.com/tutorial/hello searching for changes @@ -8,3 +9,4 @@ summary: Added an extra line of output </screen> +<!-- END tour.outgoing.net -->
--- a/en/examples/results/tour.outgoing.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.outgoing.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.outgoing --> <screen><prompt>$</prompt> <userinput>cd my-hello</userinput> <prompt>$</prompt> <userinput>hg outgoing ../hello-push</userinput> comparing with ../hello-push @@ -9,3 +10,4 @@ summary: Added an extra line of output </screen> +<!-- END tour.outgoing -->
--- a/en/examples/results/tour.parents.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.parents.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.parents --> <screen><prompt>$</prompt> <userinput>hg parents</userinput> changeset: tag: tip @@ -6,3 +7,4 @@ summary: Added an extra line of output </screen> +<!-- END tour.parents -->
--- a/en/examples/results/tour.pull.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.pull.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.pull --> <screen><prompt>$</prompt> <userinput>hg tip</userinput> changeset: tag: tip @@ -21,3 +22,4 @@ summary: Added an extra line of output </screen> +<!-- END tour.pull -->
--- a/en/examples/results/tour.push.net.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.push.net.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- BEGIN tour.push.net --> <screen><prompt>$</prompt> <userinput>hg push http://hg.serpentine.com/tutorial/hello</userinput> pushing to http://hg.serpentine.com/tutorial/hello searching for changes ssl required </screen> +<!-- END tour.push.net -->
--- a/en/examples/results/tour.push.nothing.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.push.nothing.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- BEGIN tour.push.nothing --> <screen><prompt>$</prompt> <userinput>hg push ../hello-push</userinput> pushing to ../hello-push searching for changes no changes found </screen> +<!-- END tour.push.nothing -->
--- a/en/examples/results/tour.push.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.push.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.push --> <screen><prompt>$</prompt> <userinput>hg push ../hello-push</userinput> pushing to ../hello-push searching for changes @@ -6,3 +7,4 @@ adding file changes added 1 changesets with 1 changes to 1 files </screen> +<!-- END tour.push -->
--- a/en/examples/results/tour.reclone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.reclone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ +<!-- BEGIN tour.reclone --> <screen><prompt>$</prompt> <userinput>cd ..</userinput> <prompt>$</prompt> <userinput>hg clone hello my-hello</userinput> updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved <prompt>$</prompt> <userinput>cd my-hello</userinput> </screen> +<!-- END tour.reclone -->
--- a/en/examples/results/tour.sed.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.sed.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,2 +1,4 @@ +<!-- BEGIN tour.sed --> <screen><prompt>$</prompt> <userinput>sed -i '/printf/a\\tprintf("hello again!\\n");' hello.c</userinput> </screen> +<!-- END tour.sed -->
--- a/en/examples/results/tour.status.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.status.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ +<!-- BEGIN tour.status --> <screen><prompt>$</prompt> <userinput>ls</userinput> Makefile hello.c <prompt>$</prompt> <userinput>hg status</userinput> M hello.c </screen> +<!-- END tour.status -->
--- a/en/examples/results/tour.tip.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.tip.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.tip --> <screen><prompt>$</prompt> <userinput>hg tip -vp</userinput> changeset: tag: tip @@ -20,3 +21,4 @@ } </screen> +<!-- END tour.tip -->
--- a/en/examples/results/tour.update.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.update.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour.update --> <screen><prompt>$</prompt> <userinput>grep printf hello.c</userinput> printf("hello, world!\"); <prompt>$</prompt> <userinput>hg update tip</userinput> @@ -6,3 +7,4 @@ printf("hello, world!\"); printf("hello again!\n"); </screen> +<!-- END tour.update -->
--- a/en/examples/results/tour.version.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.version.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,7 +1,9 @@ +<!-- BEGIN tour.version --> <screen><prompt>$</prompt> <userinput>hg version</userinput> -Mercurial Distributed SCM (version ) +Mercurial Distributed SCM (version unknown) -Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others +Copyright (C) 2005-2009 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. </screen> +<!-- END tour.version -->