hgbook
changeset 611:4432ad34b8e5
Check in example outputs with begin/end markers.
line diff
1.1 --- a/en/examples/results/backout.init.out Tue Mar 31 12:18:22 2009 -0700 1.2 +++ b/en/examples/results/backout.init.out Tue Mar 31 12:19:01 2009 -0700 1.3 @@ -1,3 +1,4 @@ 1.4 +<!-- BEGIN backout.init --> 1.5 <screen><prompt>$</prompt> <userinput>hg init myrepo</userinput> 1.6 <prompt>$</prompt> <userinput>cd myrepo</userinput> 1.7 <prompt>$</prompt> <userinput>echo first change >> myfile</userinput> 1.8 @@ -6,3 +7,4 @@ 1.9 <prompt>$</prompt> <userinput>echo second change >> myfile</userinput> 1.10 <prompt>$</prompt> <userinput>hg commit -m 'second change'</userinput> 1.11 </screen> 1.12 +<!-- END backout.init -->
2.1 --- a/en/examples/results/backout.manual.backout.out Tue Mar 31 12:18:22 2009 -0700 2.2 +++ b/en/examples/results/backout.manual.backout.out Tue Mar 31 12:19:01 2009 -0700 2.3 @@ -1,3 +1,4 @@ 2.4 +<!-- BEGIN backout.manual.backout --> 2.5 <screen><prompt>$</prompt> <userinput>echo third change >> myfile</userinput> 2.6 <prompt>$</prompt> <userinput>hg commit -m 'third change'</userinput> 2.7 <prompt>$</prompt> <userinput>hg backout -m 'back out second change' 1</userinput> 2.8 @@ -7,3 +8,4 @@ 2.9 the backout changeset is a new head - do not forget to merge 2.10 (use "backout --merge" if you want to auto-merge) 2.11 </screen> 2.12 +<!-- END backout.manual.backout -->
3.1 --- a/en/examples/results/backout.manual.cat.out Tue Mar 31 12:18:22 2009 -0700 3.2 +++ b/en/examples/results/backout.manual.cat.out Tue Mar 31 12:19:01 2009 -0700 3.3 @@ -1,5 +1,7 @@ 3.4 +<!-- BEGIN backout.manual.cat --> 3.5 <screen><prompt>$</prompt> <userinput>cat myfile</userinput> 3.6 first change 3.7 second change 3.8 third change 3.9 </screen> 3.10 +<!-- END backout.manual.cat -->
4.1 --- a/en/examples/results/backout.manual.clone.out Tue Mar 31 12:18:22 2009 -0700 4.2 +++ b/en/examples/results/backout.manual.clone.out Tue Mar 31 12:19:01 2009 -0700 4.3 @@ -1,3 +1,4 @@ 4.4 +<!-- BEGIN backout.manual.clone --> 4.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 4.6 <prompt>$</prompt> <userinput>hg clone -r1 myrepo newrepo</userinput> 4.7 requesting all changes 4.8 @@ -9,3 +10,4 @@ 4.9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 4.10 <prompt>$</prompt> <userinput>cd newrepo</userinput> 4.11 </screen> 4.12 +<!-- END backout.manual.clone -->
5.1 --- a/en/examples/results/backout.manual.heads.out Tue Mar 31 12:18:22 2009 -0700 5.2 +++ b/en/examples/results/backout.manual.heads.out Tue Mar 31 12:19:01 2009 -0700 5.3 @@ -1,3 +1,4 @@ 5.4 +<!-- BEGIN backout.manual.heads --> 5.5 <screen><prompt>$</prompt> <userinput>hg heads</userinput> 5.6 changeset: 5.7 tag: tip 5.8 @@ -12,3 +13,4 @@ 5.9 summary: third change 5.10 5.11 </screen> 5.12 +<!-- END backout.manual.heads -->
6.1 --- a/en/examples/results/backout.manual.log.out Tue Mar 31 12:18:22 2009 -0700 6.2 +++ b/en/examples/results/backout.manual.log.out Tue Mar 31 12:19:01 2009 -0700 6.3 @@ -1,14 +1,16 @@ 6.4 +<!-- BEGIN backout.manual.log --> 6.5 <screen><prompt>$</prompt> <userinput>hg log --style compact</userinput> 6.6 -3[tip]:1 2009-03-10 04:37 +0000 bos 6.7 +3[tip]:1 2009-03-31 19:08 +0000 bos 6.8 back out second change 6.9 6.10 -2 2009-03-10 04:37 +0000 bos 6.11 +2 2009-03-31 19:08 +0000 bos 6.12 third change 6.13 6.14 -1 2009-03-10 04:37 +0000 bos 6.15 +1 2009-03-31 19:08 +0000 bos 6.16 second change 6.17 6.18 -0 2009-03-10 04:37 +0000 bos 6.19 +0 2009-03-31 19:08 +0000 bos 6.20 first change 6.21 6.22 </screen> 6.23 +<!-- END backout.manual.log -->
7.1 --- a/en/examples/results/backout.manual.merge.out Tue Mar 31 12:18:22 2009 -0700 7.2 +++ b/en/examples/results/backout.manual.merge.out Tue Mar 31 12:19:01 2009 -0700 7.3 @@ -1,3 +1,4 @@ 7.4 +<!-- BEGIN backout.manual.merge --> 7.5 <screen><prompt>$</prompt> <userinput>hg merge</userinput> 7.6 merging myfile 7.7 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 7.8 @@ -7,3 +8,4 @@ 7.9 first change 7.10 third change 7.11 </screen> 7.12 +<!-- END backout.manual.merge -->
8.1 --- a/en/examples/results/backout.manual.parents.out Tue Mar 31 12:18:22 2009 -0700 8.2 +++ b/en/examples/results/backout.manual.parents.out Tue Mar 31 12:19:01 2009 -0700 8.3 @@ -1,3 +1,4 @@ 8.4 +<!-- BEGIN backout.manual.parents --> 8.5 <screen><prompt>$</prompt> <userinput>hg parents</userinput> 8.6 changeset: 8.7 user: Bryan O'Sullivan <bos@serpentine.com> 8.8 @@ -5,3 +6,4 @@ 8.9 summary: third change 8.10 8.11 </screen> 8.12 +<!-- END backout.manual.parents -->
9.1 --- a/en/examples/results/backout.non-tip.backout.out Tue Mar 31 12:18:22 2009 -0700 9.2 +++ b/en/examples/results/backout.non-tip.backout.out Tue Mar 31 12:19:01 2009 -0700 9.3 @@ -1,3 +1,4 @@ 9.4 +<!-- BEGIN backout.non-tip.backout --> 9.5 <screen><prompt>$</prompt> <userinput>echo third change >> myfile</userinput> 9.6 <prompt>$</prompt> <userinput>hg commit -m 'third change'</userinput> 9.7 <prompt>$</prompt> <userinput>hg backout --merge -m 'back out second change' 1</userinput> 9.8 @@ -9,3 +10,4 @@ 9.9 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 9.10 (branch merge, don't forget to commit) 9.11 </screen> 9.12 +<!-- END backout.non-tip.backout -->
10.1 --- a/en/examples/results/backout.non-tip.cat.out Tue Mar 31 12:18:22 2009 -0700 10.2 +++ b/en/examples/results/backout.non-tip.cat.out Tue Mar 31 12:19:01 2009 -0700 10.3 @@ -1,4 +1,6 @@ 10.4 +<!-- BEGIN backout.non-tip.cat --> 10.5 <screen><prompt>$</prompt> <userinput>cat myfile</userinput> 10.6 first change 10.7 third change 10.8 </screen> 10.9 +<!-- END backout.non-tip.cat -->
11.1 --- a/en/examples/results/backout.non-tip.clone.out Tue Mar 31 12:18:22 2009 -0700 11.2 +++ b/en/examples/results/backout.non-tip.clone.out Tue Mar 31 12:19:01 2009 -0700 11.3 @@ -1,3 +1,4 @@ 11.4 +<!-- BEGIN backout.non-tip.clone --> 11.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 11.6 <prompt>$</prompt> <userinput>hg clone -r1 myrepo non-tip-repo</userinput> 11.7 requesting all changes 11.8 @@ -9,3 +10,4 @@ 11.9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 11.10 <prompt>$</prompt> <userinput>cd non-tip-repo</userinput> 11.11 </screen> 11.12 +<!-- END backout.non-tip.clone -->
12.1 --- a/en/examples/results/backout.simple.log.out Tue Mar 31 12:18:22 2009 -0700 12.2 +++ b/en/examples/results/backout.simple.log.out Tue Mar 31 12:19:01 2009 -0700 12.3 @@ -1,11 +1,13 @@ 12.4 +<!-- BEGIN backout.simple.log --> 12.5 <screen><prompt>$</prompt> <userinput>hg log --style compact</userinput> 12.6 -2[tip] 2009-03-10 04:37 +0000 bos 12.7 +2[tip] 2009-03-31 19:08 +0000 bos 12.8 back out second change 12.9 12.10 -1 2009-03-10 04:37 +0000 bos 12.11 +1 2009-03-31 19:08 +0000 bos 12.12 second change 12.13 12.14 -0 2009-03-10 04:37 +0000 bos 12.15 +0 2009-03-31 19:08 +0000 bos 12.16 first change 12.17 12.18 </screen> 12.19 +<!-- END backout.simple.log -->
13.1 --- a/en/examples/results/backout.simple.out Tue Mar 31 12:18:22 2009 -0700 13.2 +++ b/en/examples/results/backout.simple.out Tue Mar 31 12:19:01 2009 -0700 13.3 @@ -1,6 +1,8 @@ 13.4 +<!-- BEGIN backout.simple --> 13.5 <screen><prompt>$</prompt> <userinput>hg backout -m 'back out second change' tip</userinput> 13.6 reverting myfile 13.7 changeset backs out changeset 13.8 <prompt>$</prompt> <userinput>cat myfile</userinput> 13.9 first change 13.10 </screen> 13.11 +<!-- END backout.simple -->
14.1 --- a/en/examples/results/bisect.commits.out Tue Mar 31 12:18:22 2009 -0700 14.2 +++ b/en/examples/results/bisect.commits.out Tue Mar 31 12:19:01 2009 -0700 14.3 @@ -9,3 +9,5 @@ 14.4 14.5 14.6 14.7 + 14.8 +
15.1 --- a/en/examples/results/bisect.help.out Tue Mar 31 12:18:22 2009 -0700 15.2 +++ b/en/examples/results/bisect.help.out Tue Mar 31 12:19:01 2009 -0700 15.3 @@ -32,3 +32,5 @@ 15.4 15.5 15.6 15.7 + 15.8 +
16.1 --- a/en/examples/results/bisect.init.out Tue Mar 31 12:18:22 2009 -0700 16.2 +++ b/en/examples/results/bisect.init.out Tue Mar 31 12:19:01 2009 -0700 16.3 @@ -1,3 +1,5 @@ 16.4 16.5 16.6 16.7 + 16.8 +
17.1 --- a/en/examples/results/bisect.search.bad-init.out Tue Mar 31 12:18:22 2009 -0700 17.2 +++ b/en/examples/results/bisect.search.bad-init.out Tue Mar 31 12:19:01 2009 -0700 17.3 @@ -1,3 +1,5 @@ 17.4 17.5 17.6 17.7 + 17.8 +
18.1 --- a/en/examples/results/bisect.search.good-init.out Tue Mar 31 12:18:22 2009 -0700 18.2 +++ b/en/examples/results/bisect.search.good-init.out Tue Mar 31 12:19:01 2009 -0700 18.3 @@ -3,3 +3,5 @@ 18.4 18.5 18.6 18.7 + 18.8 +
19.1 --- a/en/examples/results/bisect.search.init.out Tue Mar 31 12:18:22 2009 -0700 19.2 +++ b/en/examples/results/bisect.search.init.out Tue Mar 31 12:19:01 2009 -0700 19.3 @@ -1,3 +1,5 @@ 19.4 19.5 19.6 19.7 + 19.8 +
20.1 --- a/en/examples/results/bisect.search.mytest.out Tue Mar 31 12:18:22 2009 -0700 20.2 +++ b/en/examples/results/bisect.search.mytest.out Tue Mar 31 12:19:01 2009 -0700 20.3 @@ -9,3 +9,5 @@ 20.4 20.5 20.6 20.7 + 20.8 +
21.1 --- a/en/examples/results/bisect.search.reset.out Tue Mar 31 12:18:22 2009 -0700 21.2 +++ b/en/examples/results/bisect.search.reset.out Tue Mar 31 12:19:01 2009 -0700 21.3 @@ -1,3 +1,5 @@ 21.4 21.5 21.6 21.7 + 21.8 +
22.1 --- a/en/examples/results/bisect.search.rest.out Tue Mar 31 12:18:22 2009 -0700 22.2 +++ b/en/examples/results/bisect.search.rest.out Tue Mar 31 12:19:01 2009 -0700 22.3 @@ -18,3 +18,5 @@ 22.4 22.5 22.6 22.7 + 22.8 +
23.1 --- a/en/examples/results/bisect.search.step1.out Tue Mar 31 12:18:22 2009 -0700 23.2 +++ b/en/examples/results/bisect.search.step1.out Tue Mar 31 12:19:01 2009 -0700 23.3 @@ -10,3 +10,5 @@ 23.4 23.5 23.6 23.7 + 23.8 +
24.1 --- a/en/examples/results/bisect.search.step2.out Tue Mar 31 12:18:22 2009 -0700 24.2 +++ b/en/examples/results/bisect.search.step2.out Tue Mar 31 12:19:01 2009 -0700 24.3 @@ -4,3 +4,5 @@ 24.4 24.5 24.6 24.7 + 24.8 +
25.1 --- a/en/examples/results/branch-named.branch.out Tue Mar 31 12:18:22 2009 -0700 25.2 +++ b/en/examples/results/branch-named.branch.out Tue Mar 31 12:19:01 2009 -0700 25.3 @@ -1,3 +1,5 @@ 25.4 +<!-- BEGIN branch-named.branch --> 25.5 <screen><prompt>$</prompt> <userinput>hg branch</userinput> 25.6 default 25.7 </screen> 25.8 +<!-- END branch-named.branch -->
26.1 --- a/en/examples/results/branch-named.branches.out Tue Mar 31 12:18:22 2009 -0700 26.2 +++ b/en/examples/results/branch-named.branches.out Tue Mar 31 12:19:01 2009 -0700 26.3 @@ -1,3 +1,4 @@ 26.4 +<!-- BEGIN branch-named.branches --> 26.5 <screen><prompt>$</prompt> <userinput>hg tip</userinput> 26.6 changeset: 26.7 tag: tip 26.8 @@ -8,3 +9,4 @@ 26.9 <prompt>$</prompt> <userinput>hg branches</userinput> 26.10 default 26.11 </screen> 26.12 +<!-- END branch-named.branches -->
27.1 --- a/en/examples/results/branch-named.commit.out Tue Mar 31 12:18:22 2009 -0700 27.2 +++ b/en/examples/results/branch-named.commit.out Tue Mar 31 12:19:01 2009 -0700 27.3 @@ -1,3 +1,4 @@ 27.4 +<!-- BEGIN branch-named.commit --> 27.5 <screen><prompt>$</prompt> <userinput>echo 'hello again' >> myfile</userinput> 27.6 <prompt>$</prompt> <userinput>hg commit -m 'Second commit'</userinput> 27.7 <prompt>$</prompt> <userinput>hg tip</userinput> 27.8 @@ -9,3 +10,4 @@ 27.9 summary: Second commit 27.10 27.11 </screen> 27.12 +<!-- END branch-named.commit -->
28.1 --- a/en/examples/results/branch-named.create.out Tue Mar 31 12:18:22 2009 -0700 28.2 +++ b/en/examples/results/branch-named.create.out Tue Mar 31 12:19:01 2009 -0700 28.3 @@ -1,5 +1,7 @@ 28.4 +<!-- BEGIN branch-named.create --> 28.5 <screen><prompt>$</prompt> <userinput>hg branch foo</userinput> 28.6 marked working directory as branch foo 28.7 <prompt>$</prompt> <userinput>hg branch</userinput> 28.8 foo 28.9 </screen> 28.10 +<!-- END branch-named.create -->
29.1 --- a/en/examples/results/branch-named.foo-commit.out Tue Mar 31 12:18:22 2009 -0700 29.2 +++ b/en/examples/results/branch-named.foo-commit.out Tue Mar 31 12:19:01 2009 -0700 29.3 @@ -1,3 +1,4 @@ 29.4 +<!-- BEGIN branch-named.foo-commit --> 29.5 <screen><prompt>$</prompt> <userinput>echo something > somefile</userinput> 29.6 <prompt>$</prompt> <userinput>hg commit -A -m 'New file'</userinput> 29.7 adding somefile 29.8 @@ -18,3 +19,4 @@ 29.9 summary: Third commit 29.10 29.11 </screen> 29.12 +<!-- END branch-named.foo-commit -->
30.1 --- a/en/examples/results/branch-named.merge.out Tue Mar 31 12:18:22 2009 -0700 30.2 +++ b/en/examples/results/branch-named.merge.out Tue Mar 31 12:19:01 2009 -0700 30.3 @@ -1,3 +1,4 @@ 30.4 +<!-- BEGIN branch-named.merge --> 30.5 <screen><prompt>$</prompt> <userinput>hg branch</userinput> 30.6 bar 30.7 <prompt>$</prompt> <userinput>hg merge foo</userinput> 30.8 @@ -15,3 +16,4 @@ 30.9 summary: Merge 30.10 30.11 </screen> 30.12 +<!-- END branch-named.merge -->
31.1 --- a/en/examples/results/branch-named.parents.out Tue Mar 31 12:18:22 2009 -0700 31.2 +++ b/en/examples/results/branch-named.parents.out Tue Mar 31 12:19:01 2009 -0700 31.3 @@ -1,3 +1,4 @@ 31.4 +<!-- BEGIN branch-named.parents --> 31.5 <screen><prompt>$</prompt> <userinput>hg parents</userinput> 31.6 changeset: 31.7 branch: bar 31.8 @@ -11,3 +12,4 @@ 31.9 foo (inactive) 31.10 default (inactive) 31.11 </screen> 31.12 +<!-- END branch-named.parents -->
32.1 --- a/en/examples/results/branch-named.rebranch.out Tue Mar 31 12:18:22 2009 -0700 32.2 +++ b/en/examples/results/branch-named.rebranch.out Tue Mar 31 12:19:01 2009 -0700 32.3 @@ -1,3 +1,4 @@ 32.4 +<!-- BEGIN branch-named.rebranch --> 32.5 <screen><prompt>$</prompt> <userinput>hg branch</userinput> 32.6 foo 32.7 <prompt>$</prompt> <userinput>hg branch bar</userinput> 32.8 @@ -14,3 +15,4 @@ 32.9 summary: Third commit 32.10 32.11 </screen> 32.12 +<!-- END branch-named.rebranch -->
33.1 --- a/en/examples/results/branch-named.status.out Tue Mar 31 12:18:22 2009 -0700 33.2 +++ b/en/examples/results/branch-named.status.out Tue Mar 31 12:19:01 2009 -0700 33.3 @@ -1,3 +1,4 @@ 33.4 +<!-- BEGIN branch-named.status --> 33.5 <screen><prompt>$</prompt> <userinput>hg status</userinput> 33.6 <prompt>$</prompt> <userinput>hg tip</userinput> 33.7 changeset: 33.8 @@ -7,3 +8,4 @@ 33.9 summary: Initial commit 33.10 33.11 </screen> 33.12 +<!-- END branch-named.status -->
34.1 --- a/en/examples/results/branch-named.update-bar.out Tue Mar 31 12:18:22 2009 -0700 34.2 +++ b/en/examples/results/branch-named.update-bar.out Tue Mar 31 12:19:01 2009 -0700 34.3 @@ -1,3 +1,5 @@ 34.4 +<!-- BEGIN branch-named.update-bar --> 34.5 <screen><prompt>$</prompt> <userinput>hg update bar</userinput> 34.6 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 34.7 </screen> 34.8 +<!-- END branch-named.update-bar -->
35.1 --- a/en/examples/results/branch-named.update-nothing.out Tue Mar 31 12:18:22 2009 -0700 35.2 +++ b/en/examples/results/branch-named.update-nothing.out Tue Mar 31 12:19:01 2009 -0700 35.3 @@ -1,5 +1,7 @@ 35.4 +<!-- BEGIN branch-named.update-nothing --> 35.5 <screen><prompt>$</prompt> <userinput>hg update foo</userinput> 35.6 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 35.7 <prompt>$</prompt> <userinput>hg update</userinput> 35.8 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 35.9 </screen> 35.10 +<!-- END branch-named.update-nothing -->
36.1 --- a/en/examples/results/branch-named.update-switchy.out Tue Mar 31 12:18:22 2009 -0700 36.2 +++ b/en/examples/results/branch-named.update-switchy.out Tue Mar 31 12:19:01 2009 -0700 36.3 @@ -1,3 +1,4 @@ 36.4 +<!-- BEGIN branch-named.update-switchy --> 36.5 <screen><prompt>$</prompt> <userinput>hg update foo</userinput> 36.6 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 36.7 <prompt>$</prompt> <userinput>hg parents</userinput> 36.8 @@ -18,3 +19,4 @@ 36.9 summary: Third commit 36.10 36.11 </screen> 36.12 +<!-- END branch-named.update-switchy -->
37.1 --- a/en/examples/results/branch-repo.bugfix.out Tue Mar 31 12:18:22 2009 -0700 37.2 +++ b/en/examples/results/branch-repo.bugfix.out Tue Mar 31 12:19:01 2009 -0700 37.3 @@ -1,3 +1,4 @@ 37.4 +<!-- BEGIN branch-repo.bugfix --> 37.5 <screen><prompt>$</prompt> <userinput>hg clone myproject-1.0.1 my-1.0.1-bugfix</userinput> 37.6 updating working directory 37.7 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 37.8 @@ -12,3 +13,4 @@ 37.9 adding file changes 37.10 added 1 changesets with 1 changes to 1 files 37.11 </screen> 37.12 +<!-- END branch-repo.bugfix -->
38.1 --- a/en/examples/results/branch-repo.clone.out Tue Mar 31 12:18:22 2009 -0700 38.2 +++ b/en/examples/results/branch-repo.clone.out Tue Mar 31 12:19:01 2009 -0700 38.3 @@ -1,5 +1,7 @@ 38.4 +<!-- BEGIN branch-repo.clone --> 38.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 38.6 <prompt>$</prompt> <userinput>hg clone myproject myproject-1.0.1</userinput> 38.7 updating working directory 38.8 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 38.9 </screen> 38.10 +<!-- END branch-repo.clone -->
39.1 --- a/en/examples/results/branch-repo.merge.out Tue Mar 31 12:18:22 2009 -0700 39.2 +++ b/en/examples/results/branch-repo.merge.out Tue Mar 31 12:19:01 2009 -0700 39.3 @@ -1,3 +1,4 @@ 39.4 +<!-- BEGIN branch-repo.merge --> 39.5 <screen><prompt>$</prompt> <userinput>hg merge</userinput> 39.6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 39.7 (branch merge, don't forget to commit) 39.8 @@ -10,3 +11,4 @@ 39.9 adding file changes 39.10 added 2 changesets with 1 changes to 1 files 39.11 </screen> 39.12 +<!-- END branch-repo.merge -->
40.1 --- a/en/examples/results/branch-repo.new.out Tue Mar 31 12:18:22 2009 -0700 40.2 +++ b/en/examples/results/branch-repo.new.out Tue Mar 31 12:19:01 2009 -0700 40.3 @@ -1,3 +1,4 @@ 40.4 +<!-- BEGIN branch-repo.new --> 40.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 40.6 <prompt>$</prompt> <userinput>hg clone myproject my-feature</userinput> 40.7 updating working directory 40.8 @@ -14,3 +15,4 @@ 40.9 adding file changes 40.10 added 1 changesets with 1 changes to 1 files 40.11 </screen> 40.12 +<!-- END branch-repo.new -->
41.1 --- a/en/examples/results/branch-repo.pull.out Tue Mar 31 12:18:22 2009 -0700 41.2 +++ b/en/examples/results/branch-repo.pull.out Tue Mar 31 12:19:01 2009 -0700 41.3 @@ -1,3 +1,4 @@ 41.4 +<!-- BEGIN branch-repo.pull --> 41.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 41.6 <prompt>$</prompt> <userinput>hg clone myproject myproject-merge</userinput> 41.7 updating working directory 41.8 @@ -12,3 +13,4 @@ 41.9 added 1 changesets with 1 changes to 1 files (+1 heads) 41.10 (run 'hg heads' to see heads, 'hg merge' to merge) 41.11 </screen> 41.12 +<!-- END branch-repo.pull -->
42.1 --- a/en/examples/results/branch-repo.tag.out Tue Mar 31 12:18:22 2009 -0700 42.2 +++ b/en/examples/results/branch-repo.tag.out Tue Mar 31 12:19:01 2009 -0700 42.3 @@ -1,3 +1,5 @@ 42.4 +<!-- BEGIN branch-repo.tag --> 42.5 <screen><prompt>$</prompt> <userinput>cd myproject</userinput> 42.6 <prompt>$</prompt> <userinput>hg tag v1.0</userinput> 42.7 </screen> 42.8 +<!-- END branch-repo.tag -->
43.1 --- a/en/examples/results/branching.clone.out Tue Mar 31 12:18:22 2009 -0700 43.2 +++ b/en/examples/results/branching.clone.out Tue Mar 31 12:19:01 2009 -0700 43.3 @@ -1,3 +1,4 @@ 43.4 +<!-- BEGIN branching.clone --> 43.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 43.6 <prompt>$</prompt> <userinput>hg clone -rv1.0 main stable</userinput> 43.7 requesting all changes 43.8 @@ -8,3 +9,4 @@ 43.9 updating working directory 43.10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 43.11 </screen> 43.12 +<!-- END branching.clone -->
44.1 --- a/en/examples/results/branching.init.out Tue Mar 31 12:18:22 2009 -0700 44.2 +++ b/en/examples/results/branching.init.out Tue Mar 31 12:19:01 2009 -0700 44.3 @@ -1,6 +1,8 @@ 44.4 +<!-- BEGIN branching.init --> 44.5 <screen><prompt>$</prompt> <userinput>hg init main</userinput> 44.6 <prompt>$</prompt> <userinput>cd main</userinput> 44.7 <prompt>$</prompt> <userinput>echo 'This is a boring feature.' > myfile</userinput> 44.8 <prompt>$</prompt> <userinput>hg commit -A -m 'We have reached an important milestone!'</userinput> 44.9 adding myfile 44.10 </screen> 44.11 +<!-- END branching.init -->
45.1 --- a/en/examples/results/branching.main.out Tue Mar 31 12:18:22 2009 -0700 45.2 +++ b/en/examples/results/branching.main.out Tue Mar 31 12:19:01 2009 -0700 45.3 @@ -1,3 +1,4 @@ 45.4 +<!-- BEGIN branching.main --> 45.5 <screen><prompt>$</prompt> <userinput>cd ../main</userinput> 45.6 <prompt>$</prompt> <userinput>echo 'This is exciting and new!' >> myfile</userinput> 45.7 <prompt>$</prompt> <userinput>hg commit -m 'Add a new feature'</userinput> 45.8 @@ -5,3 +6,4 @@ 45.9 This is a boring feature. 45.10 This is exciting and new! 45.11 </screen> 45.12 +<!-- END branching.main -->
46.1 --- a/en/examples/results/branching.merge.out Tue Mar 31 12:18:22 2009 -0700 46.2 +++ b/en/examples/results/branching.merge.out Tue Mar 31 12:19:01 2009 -0700 46.3 @@ -1,3 +1,4 @@ 46.4 +<!-- BEGIN branching.merge --> 46.5 <screen><prompt>$</prompt> <userinput>cd ../main</userinput> 46.6 <prompt>$</prompt> <userinput>hg pull ../stable</userinput> 46.7 pulling from ../stable 46.8 @@ -16,3 +17,4 @@ 46.9 This is a fix to a boring feature. 46.10 This is exciting and new! 46.11 </screen> 46.12 +<!-- END branching.merge -->
47.1 --- a/en/examples/results/branching.stable.out Tue Mar 31 12:18:22 2009 -0700 47.2 +++ b/en/examples/results/branching.stable.out Tue Mar 31 12:19:01 2009 -0700 47.3 @@ -1,3 +1,4 @@ 47.4 +<!-- BEGIN branching.stable --> 47.5 <screen><prompt>$</prompt> <userinput>hg clone stable stable-fix</userinput> 47.6 updating working directory 47.7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 47.8 @@ -12,3 +13,4 @@ 47.9 adding file changes 47.10 added 1 changesets with 1 changes to 1 files 47.11 </screen> 47.12 +<!-- END branching.stable -->
48.1 --- a/en/examples/results/branching.tag.out Tue Mar 31 12:18:22 2009 -0700 48.2 +++ b/en/examples/results/branching.tag.out Tue Mar 31 12:19:01 2009 -0700 48.3 @@ -1,3 +1,4 @@ 48.4 +<!-- BEGIN branching.tag --> 48.5 <screen><prompt>$</prompt> <userinput>hg tag v1.0</userinput> 48.6 <prompt>$</prompt> <userinput>hg tip</userinput> 48.7 changeset: 48.8 @@ -10,3 +11,4 @@ 48.9 tip 48.10 v1.0 48.11 </screen> 48.12 +<!-- END branching.tag -->
49.1 --- a/en/examples/results/branching.update.out Tue Mar 31 12:18:22 2009 -0700 49.2 +++ b/en/examples/results/branching.update.out Tue Mar 31 12:19:01 2009 -0700 49.3 @@ -1,3 +1,4 @@ 49.4 +<!-- BEGIN branching.update --> 49.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 49.6 <prompt>$</prompt> <userinput>hg clone -U main main-old</userinput> 49.7 <prompt>$</prompt> <userinput>cd main-old</userinput> 49.8 @@ -6,3 +7,4 @@ 49.9 <prompt>$</prompt> <userinput>cat myfile</userinput> 49.10 This is a boring feature. 49.11 </screen> 49.12 +<!-- END branching.update -->
50.1 --- a/en/examples/results/cmdref.diff-p.out Tue Mar 31 12:18:22 2009 -0700 50.2 +++ b/en/examples/results/cmdref.diff-p.out Tue Mar 31 12:19:01 2009 -0700 50.3 @@ -1,3 +1,4 @@ 50.4 +<!-- BEGIN cmdref.diff-p --> 50.5 <screen><prompt>$</prompt> <userinput>echo '[diff]' >> $HGRC</userinput> 50.6 <prompt>$</prompt> <userinput>echo 'showfunc = False' >> $HGRC</userinput> 50.7 <prompt>$</prompt> <userinput>hg diff</userinput> 50.8 @@ -21,3 +22,4 @@ 50.9 + return 10; 50.10 } 50.11 </screen> 50.12 +<!-- END cmdref.diff-p -->
51.1 --- a/en/examples/results/daily.copy.after.out Tue Mar 31 12:18:22 2009 -0700 51.2 +++ b/en/examples/results/daily.copy.after.out Tue Mar 31 12:19:01 2009 -0700 51.3 @@ -1,3 +1,5 @@ 51.4 +<!-- BEGIN daily.copy.after --> 51.5 <screen><prompt>$</prompt> <userinput>cp a z</userinput> 51.6 <prompt>$</prompt> <userinput>hg copy --after a z</userinput> 51.7 </screen> 51.8 +<!-- END daily.copy.after -->
52.1 --- a/en/examples/results/daily.copy.cat.out Tue Mar 31 12:18:22 2009 -0700 52.2 +++ b/en/examples/results/daily.copy.cat.out Tue Mar 31 12:19:01 2009 -0700 52.3 @@ -1,6 +1,8 @@ 52.4 +<!-- BEGIN daily.copy.cat --> 52.5 <screen><prompt>$</prompt> <userinput>cat file</userinput> 52.6 line 52.7 new contents 52.8 <prompt>$</prompt> <userinput>cat ../my-copy/new-file</userinput> 52.9 line 52.10 </screen> 52.11 +<!-- END daily.copy.cat -->
53.1 --- a/en/examples/results/daily.copy.clone.out Tue Mar 31 12:18:22 2009 -0700 53.2 +++ b/en/examples/results/daily.copy.clone.out Tue Mar 31 12:19:01 2009 -0700 53.3 @@ -1,5 +1,7 @@ 53.4 +<!-- BEGIN daily.copy.clone --> 53.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 53.6 <prompt>$</prompt> <userinput>hg clone my-copy your-copy</userinput> 53.7 updating working directory 53.8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 53.9 </screen> 53.10 +<!-- END daily.copy.clone -->
54.1 --- a/en/examples/results/daily.copy.copy.out Tue Mar 31 12:18:22 2009 -0700 54.2 +++ b/en/examples/results/daily.copy.copy.out Tue Mar 31 12:19:01 2009 -0700 54.3 @@ -1,3 +1,5 @@ 54.4 +<!-- BEGIN daily.copy.copy --> 54.5 <screen><prompt>$</prompt> <userinput>cd my-copy</userinput> 54.6 <prompt>$</prompt> <userinput>hg copy file new-file</userinput> 54.7 </screen> 54.8 +<!-- END daily.copy.copy -->
55.1 --- a/en/examples/results/daily.copy.dir-dest.out Tue Mar 31 12:18:22 2009 -0700 55.2 +++ b/en/examples/results/daily.copy.dir-dest.out Tue Mar 31 12:19:01 2009 -0700 55.3 @@ -1,5 +1,7 @@ 55.4 +<!-- BEGIN daily.copy.dir-dest --> 55.5 <screen><prompt>$</prompt> <userinput>mkdir d</userinput> 55.6 <prompt>$</prompt> <userinput>hg copy a b d</userinput> 55.7 <prompt>$</prompt> <userinput>ls d</userinput> 55.8 a b 55.9 </screen> 55.10 +<!-- END daily.copy.dir-dest -->
56.1 --- a/en/examples/results/daily.copy.dir-src-dest.out Tue Mar 31 12:18:22 2009 -0700 56.2 +++ b/en/examples/results/daily.copy.dir-src-dest.out Tue Mar 31 12:19:01 2009 -0700 56.3 @@ -1,3 +1,5 @@ 56.4 +<!-- BEGIN daily.copy.dir-src-dest --> 56.5 <screen><prompt>$</prompt> <userinput>hg copy c d</userinput> 56.6 copying c/a/c to d/c/a/c 56.7 </screen> 56.8 +<!-- END daily.copy.dir-src-dest -->
57.1 --- a/en/examples/results/daily.copy.dir-src.out Tue Mar 31 12:18:22 2009 -0700 57.2 +++ b/en/examples/results/daily.copy.dir-src.out Tue Mar 31 12:19:01 2009 -0700 57.3 @@ -1,3 +1,5 @@ 57.4 +<!-- BEGIN daily.copy.dir-src --> 57.5 <screen><prompt>$</prompt> <userinput>hg copy c e</userinput> 57.6 copying c/a/c to e/a/c 57.7 </screen> 57.8 +<!-- END daily.copy.dir-src -->
58.1 --- a/en/examples/results/daily.copy.init.out Tue Mar 31 12:18:22 2009 -0700 58.2 +++ b/en/examples/results/daily.copy.init.out Tue Mar 31 12:19:01 2009 -0700 58.3 @@ -1,6 +1,8 @@ 58.4 +<!-- BEGIN daily.copy.init --> 58.5 <screen><prompt>$</prompt> <userinput>hg init my-copy</userinput> 58.6 <prompt>$</prompt> <userinput>cd my-copy</userinput> 58.7 <prompt>$</prompt> <userinput>echo line > file</userinput> 58.8 <prompt>$</prompt> <userinput>hg add file</userinput> 58.9 <prompt>$</prompt> <userinput>hg commit -m 'Added a file'</userinput> 58.10 </screen> 58.11 +<!-- END daily.copy.init -->
59.1 --- a/en/examples/results/daily.copy.merge.out Tue Mar 31 12:18:22 2009 -0700 59.2 +++ b/en/examples/results/daily.copy.merge.out Tue Mar 31 12:19:01 2009 -0700 59.3 @@ -1,3 +1,4 @@ 59.4 +<!-- BEGIN daily.copy.merge --> 59.5 <screen><prompt>$</prompt> <userinput>hg pull ../my-copy</userinput> 59.6 pulling from ../my-copy 59.7 searching for changes 59.8 @@ -14,3 +15,4 @@ 59.9 line 59.10 new contents 59.11 </screen> 59.12 +<!-- END daily.copy.merge -->
60.1 --- a/en/examples/results/daily.copy.other.out Tue Mar 31 12:18:22 2009 -0700 60.2 +++ b/en/examples/results/daily.copy.other.out Tue Mar 31 12:19:01 2009 -0700 60.3 @@ -1,4 +1,6 @@ 60.4 +<!-- BEGIN daily.copy.other --> 60.5 <screen><prompt>$</prompt> <userinput>cd ../your-copy</userinput> 60.6 <prompt>$</prompt> <userinput>echo 'new contents' >> file</userinput> 60.7 <prompt>$</prompt> <userinput>hg commit -m 'Changed file'</userinput> 60.8 </screen> 60.9 +<!-- END daily.copy.other -->
61.1 --- a/en/examples/results/daily.copy.simple.out Tue Mar 31 12:18:22 2009 -0700 61.2 +++ b/en/examples/results/daily.copy.simple.out Tue Mar 31 12:19:01 2009 -0700 61.3 @@ -1,5 +1,7 @@ 61.4 +<!-- BEGIN daily.copy.simple --> 61.5 <screen><prompt>$</prompt> <userinput>mkdir k</userinput> 61.6 <prompt>$</prompt> <userinput>hg copy a k</userinput> 61.7 <prompt>$</prompt> <userinput>ls k</userinput> 61.8 a 61.9 </screen> 61.10 +<!-- END daily.copy.simple -->
62.1 --- a/en/examples/results/daily.copy.status-copy.out Tue Mar 31 12:18:22 2009 -0700 62.2 +++ b/en/examples/results/daily.copy.status-copy.out Tue Mar 31 12:19:01 2009 -0700 62.3 @@ -1,5 +1,7 @@ 62.4 +<!-- BEGIN daily.copy.status-copy --> 62.5 <screen><prompt>$</prompt> <userinput>hg status -C</userinput> 62.6 A new-file 62.7 file 62.8 <prompt>$</prompt> <userinput>hg commit -m 'Copied file'</userinput> 62.9 </screen> 62.10 +<!-- END daily.copy.status-copy -->
63.1 --- a/en/examples/results/daily.copy.status.out Tue Mar 31 12:18:22 2009 -0700 63.2 +++ b/en/examples/results/daily.copy.status.out Tue Mar 31 12:19:01 2009 -0700 63.3 @@ -1,3 +1,5 @@ 63.4 +<!-- BEGIN daily.copy.status --> 63.5 <screen><prompt>$</prompt> <userinput>hg status</userinput> 63.6 A new-file 63.7 </screen> 63.8 +<!-- END daily.copy.status -->
64.1 --- a/en/examples/results/daily.files.add-dir.out Tue Mar 31 12:18:22 2009 -0700 64.2 +++ b/en/examples/results/daily.files.add-dir.out Tue Mar 31 12:19:01 2009 -0700 64.3 @@ -1,3 +1,4 @@ 64.4 +<!-- BEGIN daily.files.add-dir --> 64.5 <screen><prompt>$</prompt> <userinput>mkdir b</userinput> 64.6 <prompt>$</prompt> <userinput>echo b > b/b</userinput> 64.7 <prompt>$</prompt> <userinput>echo c > b/c</userinput> 64.8 @@ -9,3 +10,4 @@ 64.9 adding b/d/d 64.10 <prompt>$</prompt> <userinput>hg commit -m 'Added all files in subdirectory'</userinput> 64.11 </screen> 64.12 +<!-- END daily.files.add-dir -->
65.1 --- a/en/examples/results/daily.files.add.out Tue Mar 31 12:18:22 2009 -0700 65.2 +++ b/en/examples/results/daily.files.add.out Tue Mar 31 12:19:01 2009 -0700 65.3 @@ -1,3 +1,4 @@ 65.4 +<!-- BEGIN daily.files.add --> 65.5 <screen><prompt>$</prompt> <userinput>hg init add-example</userinput> 65.6 <prompt>$</prompt> <userinput>cd add-example</userinput> 65.7 <prompt>$</prompt> <userinput>echo a > a</userinput> 65.8 @@ -9,3 +10,4 @@ 65.9 <prompt>$</prompt> <userinput>hg commit -m 'Added one file'</userinput> 65.10 <prompt>$</prompt> <userinput>hg status</userinput> 65.11 </screen> 65.12 +<!-- END daily.files.add -->
66.1 --- a/en/examples/results/daily.files.addremove.out Tue Mar 31 12:18:22 2009 -0700 66.2 +++ b/en/examples/results/daily.files.addremove.out Tue Mar 31 12:19:01 2009 -0700 66.3 @@ -1,3 +1,4 @@ 66.4 +<!-- BEGIN daily.files.addremove --> 66.5 <screen><prompt>$</prompt> <userinput>hg init addremove-example</userinput> 66.6 <prompt>$</prompt> <userinput>cd addremove-example</userinput> 66.7 <prompt>$</prompt> <userinput>echo a > a</userinput> 66.8 @@ -6,3 +7,4 @@ 66.9 adding a 66.10 adding b 66.11 </screen> 66.12 +<!-- END daily.files.addremove -->
67.1 --- a/en/examples/results/daily.files.commit-addremove.out Tue Mar 31 12:18:22 2009 -0700 67.2 +++ b/en/examples/results/daily.files.commit-addremove.out Tue Mar 31 12:19:01 2009 -0700 67.3 @@ -1,4 +1,6 @@ 67.4 +<!-- BEGIN daily.files.commit-addremove --> 67.5 <screen><prompt>$</prompt> <userinput>echo c > c</userinput> 67.6 <prompt>$</prompt> <userinput>hg commit -A -m 'Commit with addremove'</userinput> 67.7 adding c 67.8 </screen> 67.9 +<!-- END daily.files.commit-addremove -->
68.1 --- a/en/examples/results/daily.files.hidden.out Tue Mar 31 12:18:22 2009 -0700 68.2 +++ b/en/examples/results/daily.files.hidden.out Tue Mar 31 12:19:01 2009 -0700 68.3 @@ -1,3 +1,4 @@ 68.4 +<!-- BEGIN daily.files.hidden --> 68.5 <screen><prompt>$</prompt> <userinput>hg init hidden-example</userinput> 68.6 <prompt>$</prompt> <userinput>cd hidden-example</userinput> 68.7 <prompt>$</prompt> <userinput>mkdir empty</userinput> 68.8 @@ -13,3 +14,4 @@ 68.9 empty 68.10 <prompt>$</prompt> <userinput>ls tmp/empty</userinput> 68.11 </screen> 68.12 +<!-- END daily.files.hidden -->
69.1 --- a/en/examples/results/daily.files.missing.out Tue Mar 31 12:18:22 2009 -0700 69.2 +++ b/en/examples/results/daily.files.missing.out Tue Mar 31 12:19:01 2009 -0700 69.3 @@ -1,3 +1,4 @@ 69.4 +<!-- BEGIN daily.files.missing --> 69.5 <screen><prompt>$</prompt> <userinput>hg init missing-example</userinput> 69.6 <prompt>$</prompt> <userinput>cd missing-example</userinput> 69.7 <prompt>$</prompt> <userinput>echo a > a</userinput> 69.8 @@ -7,3 +8,4 @@ 69.9 <prompt>$</prompt> <userinput>hg status</userinput> 69.10 ! a 69.11 </screen> 69.12 +<!-- END daily.files.missing -->
70.1 --- a/en/examples/results/daily.files.recover-missing.out Tue Mar 31 12:18:22 2009 -0700 70.2 +++ b/en/examples/results/daily.files.recover-missing.out Tue Mar 31 12:19:01 2009 -0700 70.3 @@ -1,5 +1,7 @@ 70.4 +<!-- BEGIN daily.files.recover-missing --> 70.5 <screen><prompt>$</prompt> <userinput>hg revert a</userinput> 70.6 <prompt>$</prompt> <userinput>cat a</userinput> 70.7 a 70.8 <prompt>$</prompt> <userinput>hg status</userinput> 70.9 </screen> 70.10 +<!-- END daily.files.recover-missing -->
71.1 --- a/en/examples/results/daily.files.remove-after.out Tue Mar 31 12:18:22 2009 -0700 71.2 +++ b/en/examples/results/daily.files.remove-after.out Tue Mar 31 12:19:01 2009 -0700 71.3 @@ -1,4 +1,6 @@ 71.4 +<!-- BEGIN daily.files.remove-after --> 71.5 <screen><prompt>$</prompt> <userinput>hg remove --after a</userinput> 71.6 <prompt>$</prompt> <userinput>hg status</userinput> 71.7 R a 71.8 </screen> 71.9 +<!-- END daily.files.remove-after -->
72.1 --- a/en/examples/results/daily.files.remove.out Tue Mar 31 12:18:22 2009 -0700 72.2 +++ b/en/examples/results/daily.files.remove.out Tue Mar 31 12:19:01 2009 -0700 72.3 @@ -1,3 +1,4 @@ 72.4 +<!-- BEGIN daily.files.remove --> 72.5 <screen><prompt>$</prompt> <userinput>hg init remove-example</userinput> 72.6 <prompt>$</prompt> <userinput>cd remove-example</userinput> 72.7 <prompt>$</prompt> <userinput>echo a > a</userinput> 72.8 @@ -12,3 +13,4 @@ 72.9 <prompt>$</prompt> <userinput>hg remove b</userinput> 72.10 removing b/b 72.11 </screen> 72.12 +<!-- END daily.files.remove -->
73.1 --- a/en/examples/results/daily.rename.rename.out Tue Mar 31 12:18:22 2009 -0700 73.2 +++ b/en/examples/results/daily.rename.rename.out Tue Mar 31 12:19:01 2009 -0700 73.3 @@ -1,2 +1,4 @@ 73.4 +<!-- BEGIN daily.rename.rename --> 73.5 <screen><prompt>$</prompt> <userinput>hg rename a b</userinput> 73.6 </screen> 73.7 +<!-- END daily.rename.rename -->
74.1 --- a/en/examples/results/daily.rename.status-copy.out Tue Mar 31 12:18:22 2009 -0700 74.2 +++ b/en/examples/results/daily.rename.status-copy.out Tue Mar 31 12:19:01 2009 -0700 74.3 @@ -1,5 +1,7 @@ 74.4 +<!-- BEGIN daily.rename.status-copy --> 74.5 <screen><prompt>$</prompt> <userinput>hg status -C</userinput> 74.6 A b 74.7 a 74.8 R a 74.9 </screen> 74.10 +<!-- END daily.rename.status-copy -->
75.1 --- a/en/examples/results/daily.rename.status.out Tue Mar 31 12:18:22 2009 -0700 75.2 +++ b/en/examples/results/daily.rename.status.out Tue Mar 31 12:19:01 2009 -0700 75.3 @@ -1,4 +1,6 @@ 75.4 +<!-- BEGIN daily.rename.status --> 75.5 <screen><prompt>$</prompt> <userinput>hg status</userinput> 75.6 A b 75.7 R a 75.8 </screen> 75.9 +<!-- END daily.rename.status -->
76.1 --- a/en/examples/results/daily.revert.add.out Tue Mar 31 12:18:22 2009 -0700 76.2 +++ b/en/examples/results/daily.revert.add.out Tue Mar 31 12:19:01 2009 -0700 76.3 @@ -1,3 +1,4 @@ 76.4 +<!-- BEGIN daily.revert.add --> 76.5 <screen><prompt>$</prompt> <userinput>echo oops > oops</userinput> 76.6 <prompt>$</prompt> <userinput>hg add oops</userinput> 76.7 <prompt>$</prompt> <userinput>hg status oops</userinput> 76.8 @@ -6,3 +7,4 @@ 76.9 <prompt>$</prompt> <userinput>hg status</userinput> 76.10 ? oops 76.11 </screen> 76.12 +<!-- END daily.revert.add -->
77.1 --- a/en/examples/results/daily.revert.copy.out Tue Mar 31 12:18:22 2009 -0700 77.2 +++ b/en/examples/results/daily.revert.copy.out Tue Mar 31 12:19:01 2009 -0700 77.3 @@ -1,5 +1,7 @@ 77.4 +<!-- BEGIN daily.revert.copy --> 77.5 <screen><prompt>$</prompt> <userinput>hg copy file new-file</userinput> 77.6 <prompt>$</prompt> <userinput>hg revert new-file</userinput> 77.7 <prompt>$</prompt> <userinput>hg status</userinput> 77.8 ? new-file 77.9 </screen> 77.10 +<!-- END daily.revert.copy -->
78.1 --- a/en/examples/results/daily.revert.missing.out Tue Mar 31 12:18:22 2009 -0700 78.2 +++ b/en/examples/results/daily.revert.missing.out Tue Mar 31 12:19:01 2009 -0700 78.3 @@ -1,3 +1,4 @@ 78.4 +<!-- BEGIN daily.revert.missing --> 78.5 <screen><prompt>$</prompt> <userinput>rm file</userinput> 78.6 <prompt>$</prompt> <userinput>hg status</userinput> 78.7 ! file 78.8 @@ -5,3 +6,4 @@ 78.9 <prompt>$</prompt> <userinput>ls file</userinput> 78.10 file 78.11 </screen> 78.12 +<!-- END daily.revert.missing -->
79.1 --- a/en/examples/results/daily.revert.modify.out Tue Mar 31 12:18:22 2009 -0700 79.2 +++ b/en/examples/results/daily.revert.modify.out Tue Mar 31 12:19:01 2009 -0700 79.3 @@ -1,3 +1,4 @@ 79.4 +<!-- BEGIN daily.revert.modify --> 79.5 <screen><prompt>$</prompt> <userinput>cat file</userinput> 79.6 original content 79.7 <prompt>$</prompt> <userinput>echo unwanted change >> file</userinput> 79.8 @@ -9,3 +10,4 @@ 79.9 original content 79.10 +unwanted change 79.11 </screen> 79.12 +<!-- END daily.revert.modify -->
80.1 --- a/en/examples/results/daily.revert.remove.out Tue Mar 31 12:18:22 2009 -0700 80.2 +++ b/en/examples/results/daily.revert.remove.out Tue Mar 31 12:19:01 2009 -0700 80.3 @@ -1,3 +1,4 @@ 80.4 +<!-- BEGIN daily.revert.remove --> 80.5 <screen><prompt>$</prompt> <userinput>hg remove file</userinput> 80.6 <prompt>$</prompt> <userinput>hg status</userinput> 80.7 R file 80.8 @@ -6,3 +7,4 @@ 80.9 <prompt>$</prompt> <userinput>ls file</userinput> 80.10 file 80.11 </screen> 80.12 +<!-- END daily.revert.remove -->
81.1 --- a/en/examples/results/daily.revert.rename-orig.out Tue Mar 31 12:18:22 2009 -0700 81.2 +++ b/en/examples/results/daily.revert.rename-orig.out Tue Mar 31 12:19:01 2009 -0700 81.3 @@ -1,5 +1,7 @@ 81.4 +<!-- BEGIN daily.revert.rename-orig --> 81.5 <screen><prompt>$</prompt> <userinput>hg revert file</userinput> 81.6 no changes needed to file 81.7 <prompt>$</prompt> <userinput>hg status</userinput> 81.8 ? new-file 81.9 </screen> 81.10 +<!-- END daily.revert.rename-orig -->
82.1 --- a/en/examples/results/daily.revert.rename.out Tue Mar 31 12:18:22 2009 -0700 82.2 +++ b/en/examples/results/daily.revert.rename.out Tue Mar 31 12:19:01 2009 -0700 82.3 @@ -1,5 +1,7 @@ 82.4 +<!-- BEGIN daily.revert.rename --> 82.5 <screen><prompt>$</prompt> <userinput>hg rename file new-file</userinput> 82.6 <prompt>$</prompt> <userinput>hg revert new-file</userinput> 82.7 <prompt>$</prompt> <userinput>hg status</userinput> 82.8 ? new-file 82.9 </screen> 82.10 +<!-- END daily.revert.rename -->
83.1 --- a/en/examples/results/daily.revert.status.out Tue Mar 31 12:18:22 2009 -0700 83.2 +++ b/en/examples/results/daily.revert.status.out Tue Mar 31 12:19:01 2009 -0700 83.3 @@ -1,6 +1,8 @@ 83.4 +<!-- BEGIN daily.revert.status --> 83.5 <screen><prompt>$</prompt> <userinput>hg status</userinput> 83.6 ? file.orig 83.7 <prompt>$</prompt> <userinput>cat file.orig</userinput> 83.8 original content 83.9 unwanted change 83.10 </screen> 83.11 +<!-- END daily.revert.status -->
84.1 --- a/en/examples/results/daily.revert.unmodify.out Tue Mar 31 12:18:22 2009 -0700 84.2 +++ b/en/examples/results/daily.revert.unmodify.out Tue Mar 31 12:19:01 2009 -0700 84.3 @@ -1,6 +1,8 @@ 84.4 +<!-- BEGIN daily.revert.unmodify --> 84.5 <screen><prompt>$</prompt> <userinput>hg status</userinput> 84.6 M file 84.7 <prompt>$</prompt> <userinput>hg revert file</userinput> 84.8 <prompt>$</prompt> <userinput>cat file</userinput> 84.9 original content 84.10 </screen> 84.11 +<!-- END daily.revert.unmodify -->
85.1 --- a/en/examples/results/extdiff.diff.out Tue Mar 31 12:18:22 2009 -0700 85.2 +++ b/en/examples/results/extdiff.diff.out Tue Mar 31 12:19:01 2009 -0700 85.3 @@ -1,3 +1,4 @@ 85.4 +<!-- BEGIN extdiff.diff --> 85.5 <screen><prompt>$</prompt> <userinput>hg diff</userinput> 85.6 diff -r myfile 85.7 85.8 @@ -6,3 +7,4 @@ 85.9 The first line. 85.10 +The second line. 85.11 </screen> 85.12 +<!-- END extdiff.diff -->
86.1 --- a/en/examples/results/extdiff.extdiff-ctx.out Tue Mar 31 12:18:22 2009 -0700 86.2 +++ b/en/examples/results/extdiff.extdiff-ctx.out Tue Mar 31 12:19:01 2009 -0700 86.3 @@ -1,3 +1,4 @@ 86.4 +<!-- BEGIN extdiff.extdiff-ctx --> 86.5 <screen><prompt>$</prompt> <userinput>hg extdiff -o -NprcC5</userinput> 86.6 86.7 86.8 @@ -7,3 +8,4 @@ 86.9 The first line. 86.10 + The second line. 86.11 </screen> 86.12 +<!-- END extdiff.extdiff-ctx -->
87.1 --- a/en/examples/results/extdiff.extdiff.out Tue Mar 31 12:18:22 2009 -0700 87.2 +++ b/en/examples/results/extdiff.extdiff.out Tue Mar 31 12:19:01 2009 -0700 87.3 @@ -1,3 +1,4 @@ 87.4 +<!-- BEGIN extdiff.extdiff --> 87.5 <screen><prompt>$</prompt> <userinput>hg extdiff</userinput> 87.6 87.7 87.8 @@ -5,3 +6,4 @@ 87.9 The first line. 87.10 +The second line. 87.11 </screen> 87.12 +<!-- END extdiff.extdiff -->
88.1 --- a/en/examples/results/filenames.dirs.out Tue Mar 31 12:18:22 2009 -0700 88.2 +++ b/en/examples/results/filenames.dirs.out Tue Mar 31 12:19:01 2009 -0700 88.3 @@ -1,6 +1,8 @@ 88.4 +<!-- BEGIN filenames.dirs --> 88.5 <screen><prompt>$</prompt> <userinput>hg status src</userinput> 88.6 ? src/main.py 88.7 ? src/watcher/_watcher.c 88.8 ? src/watcher/watcher.py 88.9 ? src/xyzzy.txt 88.10 </screen> 88.11 +<!-- END filenames.dirs -->
89.1 --- a/en/examples/results/filenames.files.out Tue Mar 31 12:18:22 2009 -0700 89.2 +++ b/en/examples/results/filenames.files.out Tue Mar 31 12:19:01 2009 -0700 89.3 @@ -1,2 +1,4 @@ 89.4 +<!-- BEGIN filenames.files --> 89.5 <screen><prompt>$</prompt> <userinput>hg add COPYING README examples/simple.py</userinput> 89.6 </screen> 89.7 +<!-- END filenames.files -->
90.1 --- a/en/examples/results/filenames.filter.exclude.out Tue Mar 31 12:18:22 2009 -0700 90.2 +++ b/en/examples/results/filenames.filter.exclude.out Tue Mar 31 12:19:01 2009 -0700 90.3 @@ -1,4 +1,6 @@ 90.4 +<!-- BEGIN filenames.filter.exclude --> 90.5 <screen><prompt>$</prompt> <userinput>hg status -X '**.py' src</userinput> 90.6 ? src/watcher/_watcher.c 90.7 ? src/xyzzy.txt 90.8 </screen> 90.9 +<!-- END filenames.filter.exclude -->
91.1 --- a/en/examples/results/filenames.filter.include.out Tue Mar 31 12:18:22 2009 -0700 91.2 +++ b/en/examples/results/filenames.filter.include.out Tue Mar 31 12:19:01 2009 -0700 91.3 @@ -1,3 +1,5 @@ 91.4 +<!-- BEGIN filenames.filter.include --> 91.5 <screen><prompt>$</prompt> <userinput>hg status -I '*.in'</userinput> 91.6 ? MANIFEST.in 91.7 </screen> 91.8 +<!-- END filenames.filter.include -->
92.1 --- a/en/examples/results/filenames.glob.group.out Tue Mar 31 12:18:22 2009 -0700 92.2 +++ b/en/examples/results/filenames.glob.group.out Tue Mar 31 12:19:01 2009 -0700 92.3 @@ -1,4 +1,6 @@ 92.4 +<!-- BEGIN filenames.glob.group --> 92.5 <screen><prompt>$</prompt> <userinput>hg status 'glob:*.{in,py}'</userinput> 92.6 ? MANIFEST.in 92.7 ? setup.py 92.8 </screen> 92.9 +<!-- END filenames.glob.group -->
93.1 --- a/en/examples/results/filenames.glob.question.out Tue Mar 31 12:18:22 2009 -0700 93.2 +++ b/en/examples/results/filenames.glob.question.out Tue Mar 31 12:19:01 2009 -0700 93.3 @@ -1,3 +1,5 @@ 93.4 +<!-- BEGIN filenames.glob.question --> 93.5 <screen><prompt>$</prompt> <userinput>hg status 'glob:**.?'</userinput> 93.6 ? src/watcher/_watcher.c 93.7 </screen> 93.8 +<!-- END filenames.glob.question -->
94.1 --- a/en/examples/results/filenames.glob.range.out Tue Mar 31 12:18:22 2009 -0700 94.2 +++ b/en/examples/results/filenames.glob.range.out Tue Mar 31 12:19:01 2009 -0700 94.3 @@ -1,4 +1,6 @@ 94.4 +<!-- BEGIN filenames.glob.range --> 94.5 <screen><prompt>$</prompt> <userinput>hg status 'glob:**[nr-t]'</userinput> 94.6 ? MANIFEST.in 94.7 ? src/xyzzy.txt 94.8 </screen> 94.9 +<!-- END filenames.glob.range -->
95.1 --- a/en/examples/results/filenames.glob.star-starstar.out Tue Mar 31 12:18:22 2009 -0700 95.2 +++ b/en/examples/results/filenames.glob.star-starstar.out Tue Mar 31 12:19:01 2009 -0700 95.3 @@ -1,3 +1,4 @@ 95.4 +<!-- BEGIN filenames.glob.star-starstar --> 95.5 <screen><prompt>$</prompt> <userinput>hg status 'glob:*.py'</userinput> 95.6 ? setup.py 95.7 <prompt>$</prompt> <userinput>hg status 'glob:**.py'</userinput> 95.8 @@ -7,3 +8,4 @@ 95.9 ? setup.py 95.10 ? src/watcher/watcher.py 95.11 </screen> 95.12 +<!-- END filenames.glob.star-starstar -->
96.1 --- a/en/examples/results/filenames.glob.star.out Tue Mar 31 12:18:22 2009 -0700 96.2 +++ b/en/examples/results/filenames.glob.star.out Tue Mar 31 12:19:01 2009 -0700 96.3 @@ -1,3 +1,5 @@ 96.4 +<!-- BEGIN filenames.glob.star --> 96.5 <screen><prompt>$</prompt> <userinput>hg add 'glob:*.py'</userinput> 96.6 adding main.py 96.7 </screen> 96.8 +<!-- END filenames.glob.star -->
97.1 --- a/en/examples/results/filenames.glob.starstar.out Tue Mar 31 12:18:22 2009 -0700 97.2 +++ b/en/examples/results/filenames.glob.starstar.out Tue Mar 31 12:19:01 2009 -0700 97.3 @@ -1,3 +1,4 @@ 97.4 +<!-- BEGIN filenames.glob.starstar --> 97.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 97.6 <prompt>$</prompt> <userinput>hg status 'glob:**.py'</userinput> 97.7 A examples/simple.py 97.8 @@ -6,3 +7,4 @@ 97.9 ? setup.py 97.10 ? src/watcher/watcher.py 97.11 </screen> 97.12 +<!-- END filenames.glob.starstar -->
98.1 --- a/en/examples/results/filenames.wdir-relname.out Tue Mar 31 12:18:22 2009 -0700 98.2 +++ b/en/examples/results/filenames.wdir-relname.out Tue Mar 31 12:19:01 2009 -0700 98.3 @@ -1,3 +1,4 @@ 98.4 +<!-- BEGIN filenames.wdir-relname --> 98.5 <screen><prompt>$</prompt> <userinput>hg status</userinput> 98.6 A COPYING 98.7 A README 98.8 @@ -21,3 +22,4 @@ 98.9 ? watcher/watcher.py 98.10 ? xyzzy.txt 98.11 </screen> 98.12 +<!-- END filenames.wdir-relname -->
99.1 --- a/en/examples/results/filenames.wdir-subdir.out Tue Mar 31 12:18:22 2009 -0700 99.2 +++ b/en/examples/results/filenames.wdir-subdir.out Tue Mar 31 12:19:01 2009 -0700 99.3 @@ -1,3 +1,4 @@ 99.4 +<!-- BEGIN filenames.wdir-subdir --> 99.5 <screen><prompt>$</prompt> <userinput>cd src</userinput> 99.6 <prompt>$</prompt> <userinput>hg add -n</userinput> 99.7 adding ../MANIFEST.in 99.8 @@ -13,3 +14,4 @@ 99.9 adding watcher/watcher.py 99.10 adding xyzzy.txt 99.11 </screen> 99.12 +<!-- END filenames.wdir-subdir -->
100.1 --- a/en/examples/results/hook.msglen.go.out Tue Mar 31 12:18:22 2009 -0700 100.2 +++ b/en/examples/results/hook.msglen.go.out Tue Mar 31 12:19:01 2009 -0700 100.3 @@ -1,3 +1,4 @@ 100.4 +<!-- BEGIN hook.msglen.go --> 100.5 <screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput> 100.6 [hooks] 100.7 pretxncommit.msglen = test `hg tip --template {desc} | wc -c` -ge 10 100.8 @@ -9,3 +10,4 @@ 100.9 abort: pretxncommit.msglen hook exited with status 1 100.10 <prompt>$</prompt> <userinput>hg commit -A -m 'long enough'</userinput> 100.11 </screen> 100.12 +<!-- END hook.msglen.go -->
101.1 --- a/en/examples/results/hook.simple.ext.out Tue Mar 31 12:18:22 2009 -0700 101.2 +++ b/en/examples/results/hook.simple.ext.out Tue Mar 31 12:19:01 2009 -0700 101.3 @@ -1,6 +1,8 @@ 101.4 +<!-- BEGIN hook.simple.ext --> 101.5 <screen><prompt>$</prompt> <userinput>echo 'commit.when = echo -n "date of commit: "; date' >> .hg/hgrc</userinput> 101.6 <prompt>$</prompt> <userinput>echo a >> a</userinput> 101.7 <prompt>$</prompt> <userinput>hg commit -m 'i have two hooks'</userinput> 101.8 committed 101.9 101.10 </screen> 101.11 +<!-- END hook.simple.ext -->
102.1 --- a/en/examples/results/hook.simple.init.out Tue Mar 31 12:18:22 2009 -0700 102.2 +++ b/en/examples/results/hook.simple.init.out Tue Mar 31 12:19:01 2009 -0700 102.3 @@ -1,3 +1,4 @@ 102.4 +<!-- BEGIN hook.simple.init --> 102.5 <screen><prompt>$</prompt> <userinput>hg init hook-test</userinput> 102.6 <prompt>$</prompt> <userinput>cd hook-test</userinput> 102.7 <prompt>$</prompt> <userinput>echo '[hooks]' >> .hg/hgrc</userinput> 102.8 @@ -10,3 +11,4 @@ 102.9 <prompt>$</prompt> <userinput>hg commit -m 'testing commit hook'</userinput> 102.10 committed 102.11 </screen> 102.12 +<!-- END hook.simple.init -->
103.1 --- a/en/examples/results/hook.simple.pretxncommit.out Tue Mar 31 12:18:22 2009 -0700 103.2 +++ b/en/examples/results/hook.simple.pretxncommit.out Tue Mar 31 12:19:01 2009 -0700 103.3 @@ -1,3 +1,4 @@ 103.4 +<!-- BEGIN hook.simple.pretxncommit --> 103.5 <screen><prompt>$</prompt> <userinput>cat check_bug_id</userinput> 103.6 #!/bin/sh 103.7 # check that a commit comment mentions a numeric bug id 103.8 @@ -12,3 +13,4 @@ 103.9 committed 103.10 103.11 </screen> 103.12 +<!-- END hook.simple.pretxncommit -->
104.1 --- a/en/examples/results/hook.ws.better.out Tue Mar 31 12:18:22 2009 -0700 104.2 +++ b/en/examples/results/hook.ws.better.out Tue Mar 31 12:19:01 2009 -0700 104.3 @@ -1,3 +1,4 @@ 104.4 +<!-- BEGIN hook.ws.better --> 104.5 <screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput> 104.6 [hooks] 104.7 pretxncommit.whitespace = .hg/check_whitespace.py 104.8 @@ -16,3 +17,4 @@ 104.9 rollback completed 104.10 abort: pretxncommit.whitespace hook exited with status 1 104.11 </screen> 104.12 +<!-- END hook.ws.better -->
105.1 --- a/en/examples/results/hook.ws.simple.out Tue Mar 31 12:18:22 2009 -0700 105.2 +++ b/en/examples/results/hook.ws.simple.out Tue Mar 31 12:19:01 2009 -0700 105.3 @@ -1,3 +1,4 @@ 105.4 +<!-- BEGIN hook.ws.simple --> 105.5 <screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput> 105.6 [hooks] 105.7 pretxncommit.whitespace = hg export tip | (! egrep -q '^\+.*[ \t]$') 105.8 @@ -10,3 +11,4 @@ 105.9 <prompt>$</prompt> <userinput>echo 'a' > a</userinput> 105.10 <prompt>$</prompt> <userinput>hg commit -A -m 'drop trailing whitespace and try again'</userinput> 105.11 </screen> 105.12 +<!-- END hook.ws.simple -->
106.1 --- a/en/examples/results/issue29.go.out Tue Mar 31 12:18:22 2009 -0700 106.2 +++ b/en/examples/results/issue29.go.out Tue Mar 31 12:19:01 2009 -0700 106.3 @@ -1,3 +1,4 @@ 106.4 +<!-- BEGIN issue29.go --> 106.5 <screen><prompt>$</prompt> <userinput>hg init issue29</userinput> 106.6 <prompt>$</prompt> <userinput>cd issue29</userinput> 106.7 <prompt>$</prompt> <userinput>echo a > a</userinput> 106.8 @@ -16,3 +17,4 @@ 106.9 <prompt>$</prompt> <userinput>hg merge</userinput> 106.10 106.11 </screen> 106.12 +<!-- END issue29.go -->
107.1 --- a/en/examples/results/mq.dodiff.diff.out Tue Mar 31 12:18:22 2009 -0700 107.2 +++ b/en/examples/results/mq.dodiff.diff.out Tue Mar 31 12:19:01 2009 -0700 107.3 @@ -1,3 +1,4 @@ 107.4 +<!-- BEGIN mq.dodiff.diff --> 107.5 <screen><prompt>$</prompt> <userinput>echo 'this is my original thought' > oldfile</userinput> 107.6 <prompt>$</prompt> <userinput>echo 'i have changed my mind' > newfile</userinput> 107.7 <prompt>$</prompt> <userinput>diff -u oldfile newfile > tiny.patch</userinput> 107.8 @@ -12,3 +13,4 @@ 107.9 <prompt>$</prompt> <userinput>cat oldfile</userinput> 107.10 i have changed my mind 107.11 </screen> 107.12 +<!-- END mq.dodiff.diff -->
108.1 --- a/en/examples/results/mq.guards.init.out Tue Mar 31 12:18:22 2009 -0700 108.2 +++ b/en/examples/results/mq.guards.init.out Tue Mar 31 12:19:01 2009 -0700 108.3 @@ -1,3 +1,4 @@ 108.4 +<!-- BEGIN mq.guards.init --> 108.5 <screen><prompt>$</prompt> <userinput>hg qinit</userinput> 108.6 <prompt>$</prompt> <userinput>hg qnew hello.patch</userinput> 108.7 <prompt>$</prompt> <userinput>echo hello > hello</userinput> 108.8 @@ -8,3 +9,4 @@ 108.9 <prompt>$</prompt> <userinput>hg add goodbye</userinput> 108.10 <prompt>$</prompt> <userinput>hg qrefresh</userinput> 108.11 </screen> 108.12 +<!-- END mq.guards.init -->
109.1 --- a/en/examples/results/mq.guards.qguard.neg.out Tue Mar 31 12:18:22 2009 -0700 109.2 +++ b/en/examples/results/mq.guards.qguard.neg.out Tue Mar 31 12:19:01 2009 -0700 109.3 @@ -1,4 +1,30 @@ 109.4 +<!-- BEGIN mq.guards.qguard.neg --> 109.5 <screen><prompt>$</prompt> <userinput>hg qguard hello.patch -quux</userinput> 109.6 +hg qguard: option -u not recognized 109.7 +hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]... 109.8 + 109.9 +set or print guards for a patch 109.10 + 109.11 + Guards control whether a patch can be pushed. A patch with no 109.12 + guards is always pushed. A patch with a positive guard ("+foo") is 109.13 + pushed only if the qselect command has activated it. A patch with 109.14 + a negative guard ("-foo") is never pushed if the qselect command 109.15 + has activated it. 109.16 + 109.17 + With no arguments, print the currently active guards. 109.18 + With arguments, set guards for the named patch. 109.19 + NOTE: Specifying negative guards now requires '--'. 109.20 + 109.21 + To set guards on another patch: 109.22 + hg qguard -- other.patch +2.6.17 -stable 109.23 + 109.24 +options: 109.25 + 109.26 + -l --list list all patches and guards 109.27 + -n --none drop all guards 109.28 + 109.29 +use "hg -v help qguard" to show global options 109.30 <prompt>$</prompt> <userinput>hg qguard hello.patch</userinput> 109.31 -hello.patch: -quux 109.32 +hello.patch: unguarded 109.33 </screen> 109.34 +<!-- END mq.guards.qguard.neg -->
110.1 --- a/en/examples/results/mq.guards.qguard.out Tue Mar 31 12:18:22 2009 -0700 110.2 +++ b/en/examples/results/mq.guards.qguard.out Tue Mar 31 12:19:01 2009 -0700 110.3 @@ -1,3 +1,5 @@ 110.4 +<!-- BEGIN mq.guards.qguard --> 110.5 <screen><prompt>$</prompt> <userinput>hg qguard</userinput> 110.6 goodbye.patch: unguarded 110.7 </screen> 110.8 +<!-- END mq.guards.qguard -->
111.1 --- a/en/examples/results/mq.guards.qguard.pos.out Tue Mar 31 12:18:22 2009 -0700 111.2 +++ b/en/examples/results/mq.guards.qguard.pos.out Tue Mar 31 12:19:01 2009 -0700 111.3 @@ -1,4 +1,6 @@ 111.4 +<!-- BEGIN mq.guards.qguard.pos --> 111.5 <screen><prompt>$</prompt> <userinput>hg qguard +foo</userinput> 111.6 <prompt>$</prompt> <userinput>hg qguard</userinput> 111.7 goodbye.patch: +foo 111.8 </screen> 111.9 +<!-- END mq.guards.qguard.pos -->
112.1 --- a/en/examples/results/mq.guards.qselect.cat.out Tue Mar 31 12:18:22 2009 -0700 112.2 +++ b/en/examples/results/mq.guards.qselect.cat.out Tue Mar 31 12:19:01 2009 -0700 112.3 @@ -1,3 +1,5 @@ 112.4 +<!-- BEGIN mq.guards.qselect.cat --> 112.5 <screen><prompt>$</prompt> <userinput>cat .hg/patches/guards</userinput> 112.6 foo 112.7 </screen> 112.8 +<!-- END mq.guards.qselect.cat -->
113.1 --- a/en/examples/results/mq.guards.qselect.error.out Tue Mar 31 12:18:22 2009 -0700 113.2 +++ b/en/examples/results/mq.guards.qselect.error.out Tue Mar 31 12:19:01 2009 -0700 113.3 @@ -1,3 +1,5 @@ 113.4 +<!-- BEGIN mq.guards.qselect.error --> 113.5 <screen><prompt>$</prompt> <userinput>hg qselect +foo</userinput> 113.6 abort: guard '+foo' starts with invalid character: '+' 113.7 </screen> 113.8 +<!-- END mq.guards.qselect.error -->
114.1 --- a/en/examples/results/mq.guards.qselect.foo.out Tue Mar 31 12:18:22 2009 -0700 114.2 +++ b/en/examples/results/mq.guards.qselect.foo.out Tue Mar 31 12:19:01 2009 -0700 114.3 @@ -1,3 +1,4 @@ 114.4 +<!-- BEGIN mq.guards.qselect.foo --> 114.5 <screen><prompt>$</prompt> <userinput>hg qpop -a</userinput> 114.6 patch queue now empty 114.7 <prompt>$</prompt> <userinput>hg qselect</userinput> 114.8 @@ -7,3 +8,4 @@ 114.9 <prompt>$</prompt> <userinput>hg qselect</userinput> 114.10 foo 114.11 </screen> 114.12 +<!-- END mq.guards.qselect.foo -->
115.1 --- a/en/examples/results/mq.guards.qselect.foobar.out Tue Mar 31 12:18:22 2009 -0700 115.2 +++ b/en/examples/results/mq.guards.qselect.foobar.out Tue Mar 31 12:19:01 2009 -0700 115.3 @@ -1,9 +1,11 @@ 115.4 +<!-- BEGIN mq.guards.qselect.foobar --> 115.5 <screen><prompt>$</prompt> <userinput>hg qselect foo bar</userinput> 115.6 -number of unguarded, unapplied patches has changed from 0 to 2 115.7 +number of unguarded, unapplied patches has changed from 0 to 1 115.8 <prompt>$</prompt> <userinput>hg qpop -a</userinput> 115.9 -no patches applied 115.10 +patch queue now empty 115.11 <prompt>$</prompt> <userinput>hg qpush -a</userinput> 115.12 applying hello.patch 115.13 applying goodbye.patch 115.14 now at: goodbye.patch 115.15 </screen> 115.16 +<!-- END mq.guards.qselect.foobar -->
116.1 --- a/en/examples/results/mq.guards.qselect.qpush.out Tue Mar 31 12:18:22 2009 -0700 116.2 +++ b/en/examples/results/mq.guards.qselect.qpush.out Tue Mar 31 12:19:01 2009 -0700 116.3 @@ -1,5 +1,7 @@ 116.4 +<!-- BEGIN mq.guards.qselect.qpush --> 116.5 <screen><prompt>$</prompt> <userinput>hg qpush -a</userinput> 116.6 applying hello.patch 116.7 applying goodbye.patch 116.8 now at: goodbye.patch 116.9 </screen> 116.10 +<!-- END mq.guards.qselect.qpush -->
117.1 --- a/en/examples/results/mq.guards.qselect.quux.out Tue Mar 31 12:18:22 2009 -0700 117.2 +++ b/en/examples/results/mq.guards.qselect.quux.out Tue Mar 31 12:19:01 2009 -0700 117.3 @@ -1,7 +1,11 @@ 117.4 +<!-- BEGIN mq.guards.qselect.quux --> 117.5 <screen><prompt>$</prompt> <userinput>hg qselect quux</userinput> 117.6 -number of guarded, applied patches has changed from 0 to 2 117.7 +number of guarded, applied patches has changed from 0 to 1 117.8 <prompt>$</prompt> <userinput>hg qpop -a</userinput> 117.9 patch queue now empty 117.10 <prompt>$</prompt> <userinput>hg qpush -a</userinput> 117.11 -patch series already fully applied 117.12 +applying hello.patch 117.13 +skipping goodbye.patch - guarded by ['+foo'] 117.14 +now at: hello.patch 117.15 </screen> 117.16 +<!-- END mq.guards.qselect.quux -->
118.1 --- a/en/examples/results/mq.guards.series.out Tue Mar 31 12:18:22 2009 -0700 118.2 +++ b/en/examples/results/mq.guards.series.out Tue Mar 31 12:19:01 2009 -0700 118.3 @@ -1,4 +1,6 @@ 118.4 +<!-- BEGIN mq.guards.series --> 118.5 <screen><prompt>$</prompt> <userinput>cat .hg/patches/series</userinput> 118.6 -hello.patch #-quux 118.7 +hello.patch 118.8 goodbye.patch #+foo 118.9 </screen> 118.10 +<!-- END mq.guards.series -->
119.1 --- a/en/examples/results/mq.id.output.out Tue Mar 31 12:18:22 2009 -0700 119.2 +++ b/en/examples/results/mq.id.output.out Tue Mar 31 12:19:01 2009 -0700 119.3 @@ -1,3 +1,4 @@ 119.4 +<!-- BEGIN mq.id.output --> 119.5 <screen><prompt>$</prompt> <userinput>hg qapplied</userinput> 119.6 first.patch 119.7 second.patch 119.8 @@ -31,3 +32,4 @@ 119.9 @@ -0,0 +1,1 @@ 119.10 +double u; 119.11 </screen> 119.12 +<!-- END mq.id.output -->
120.1 --- a/en/examples/results/mq.qinit-help.help.out Tue Mar 31 12:18:22 2009 -0700 120.2 +++ b/en/examples/results/mq.qinit-help.help.out Tue Mar 31 12:19:01 2009 -0700 120.3 @@ -1,3 +1,4 @@ 120.4 +<!-- BEGIN mq.qinit-help.help --> 120.5 <screen><prompt>$</prompt> <userinput>hg help qinit</userinput> 120.6 hg qinit [-c] 120.7 120.8 @@ -15,3 +16,4 @@ 120.9 120.10 use "hg -v help qinit" to show global options 120.11 </screen> 120.12 +<!-- END mq.qinit-help.help -->
121.1 --- a/en/examples/results/mq.tarball.download.out Tue Mar 31 12:18:22 2009 -0700 121.2 +++ b/en/examples/results/mq.tarball.download.out Tue Mar 31 12:19:01 2009 -0700 121.3 @@ -1,3 +1,4 @@ 121.4 +<!-- BEGIN mq.tarball.download --> 121.5 <screen><prompt>$</prompt> <userinput>download netplug-1.2.5.tar.bz2</userinput> 121.6 <prompt>$</prompt> <userinput>tar jxf netplug-1.2.5.tar.bz2</userinput> 121.7 <prompt>$</prompt> <userinput>cd netplug-1.2.5</userinput> 121.8 @@ -8,3 +9,4 @@ 121.9 updating working directory 121.10 18 files updated, 0 files merged, 0 files removed, 0 files unresolved 121.11 </screen> 121.12 +<!-- END mq.tarball.download -->
122.1 --- a/en/examples/results/mq.tarball.newsource.out Tue Mar 31 12:18:22 2009 -0700 122.2 +++ b/en/examples/results/mq.tarball.newsource.out Tue Mar 31 12:19:01 2009 -0700 122.3 @@ -1,3 +1,4 @@ 122.4 +<!-- BEGIN mq.tarball.newsource --> 122.5 <screen><prompt>$</prompt> <userinput>hg qpop -a</userinput> 122.6 patch queue now empty 122.7 <prompt>$</prompt> <userinput>cd ..</userinput> 122.8 @@ -12,3 +13,4 @@ 122.9 <prompt>$</prompt> <userinput>cd netplug-1.2.8</userinput> 122.10 <prompt>$</prompt> <userinput>hg commit --addremove --message netplug-1.2.8</userinput> 122.11 </screen> 122.12 +<!-- END mq.tarball.newsource -->
123.1 --- a/en/examples/results/mq.tarball.qinit.out Tue Mar 31 12:18:22 2009 -0700 123.2 +++ b/en/examples/results/mq.tarball.qinit.out Tue Mar 31 12:19:01 2009 -0700 123.3 @@ -1,3 +1,4 @@ 123.4 +<!-- BEGIN mq.tarball.qinit --> 123.5 <screen><prompt>$</prompt> <userinput>cd netplug</userinput> 123.6 <prompt>$</prompt> <userinput>hg qinit</userinput> 123.7 <prompt>$</prompt> <userinput>hg qnew -m 'fix build problem with gcc 4' build-fix.patch</userinput> 123.8 @@ -27,3 +28,4 @@ 123.9 do_log(LOG_ERR, "Could not get socket details: %m"); 123.10 123.11 </screen> 123.12 +<!-- END mq.tarball.qinit -->
124.1 --- a/en/examples/results/mq.tarball.repush.out Tue Mar 31 12:18:22 2009 -0700 124.2 +++ b/en/examples/results/mq.tarball.repush.out Tue Mar 31 12:19:01 2009 -0700 124.3 @@ -1,3 +1,4 @@ 124.4 +<!-- BEGIN mq.tarball.repush --> 124.5 <screen><prompt>$</prompt> <userinput>cd ../netplug</userinput> 124.6 <prompt>$</prompt> <userinput>hg pull ../netplug-1.2.8</userinput> 124.7 pulling from ../netplug-1.2.8 124.8 @@ -12,3 +13,4 @@ 124.9 applying build-fix.patch 124.10 now at: build-fix.patch 124.11 </screen> 124.12 +<!-- END mq.tarball.repush -->
125.1 --- a/en/examples/results/mq.tools.lsdiff.out Tue Mar 31 12:18:22 2009 -0700 125.2 +++ b/en/examples/results/mq.tools.lsdiff.out Tue Mar 31 12:19:01 2009 -0700 125.3 @@ -1,3 +1,4 @@ 125.4 +<!-- BEGIN mq.tools.lsdiff --> 125.5 <screen><prompt>$</prompt> <userinput>lsdiff -nvv remove-redundant-null-checks.patch</userinput> 125.6 22 File #1 a/drivers/char/agp/sgi-agp.c 125.7 24 Hunk #1 static int __devinit agp_sgi_init(void) 125.8 @@ -20,3 +21,4 @@ 125.9 178 File #8 a/drivers/video/au1100fb.c 125.10 180 Hunk #1 void __exit au1100fb_cleanup(void) 125.11 </screen> 125.12 +<!-- END mq.tools.lsdiff -->
126.1 --- a/en/examples/results/mq.tools.tools.out Tue Mar 31 12:18:22 2009 -0700 126.2 +++ b/en/examples/results/mq.tools.tools.out Tue Mar 31 12:19:01 2009 -0700 126.3 @@ -1,3 +1,4 @@ 126.4 +<!-- BEGIN mq.tools.tools --> 126.5 <screen><prompt>$</prompt> <userinput>diffstat -p1 remove-redundant-null-checks.patch</userinput> 126.6 drivers/char/agp/sgi-agp.c | 5 ++--- 126.7 drivers/char/hvcs.c | 11 +++++------ 126.8 @@ -22,3 +23,4 @@ 126.9 126.10 module_init(au1100fb_init); 126.11 </screen> 126.12 +<!-- END mq.tools.tools -->
127.1 --- a/en/examples/results/mq.tutorial.add.out Tue Mar 31 12:18:22 2009 -0700 127.2 +++ b/en/examples/results/mq.tutorial.add.out Tue Mar 31 12:19:01 2009 -0700 127.3 @@ -1,5 +1,7 @@ 127.4 +<!-- BEGIN mq.tutorial.add --> 127.5 <screen><prompt>$</prompt> <userinput>echo 'file 3, line 1' >> file3</userinput> 127.6 <prompt>$</prompt> <userinput>hg qnew add-file3.patch</userinput> 127.7 <prompt>$</prompt> <userinput>hg qnew -f add-file3.patch</userinput> 127.8 abort: patch "add-file3.patch" already exists 127.9 </screen> 127.10 +<!-- END mq.tutorial.add -->
128.1 --- a/en/examples/results/mq.tutorial.qinit.out Tue Mar 31 12:18:22 2009 -0700 128.2 +++ b/en/examples/results/mq.tutorial.qinit.out Tue Mar 31 12:19:01 2009 -0700 128.3 @@ -1,3 +1,4 @@ 128.4 +<!-- BEGIN mq.tutorial.qinit --> 128.5 <screen><prompt>$</prompt> <userinput>hg init mq-sandbox</userinput> 128.6 <prompt>$</prompt> <userinput>cd mq-sandbox</userinput> 128.7 <prompt>$</prompt> <userinput>echo 'line 1' > file1</userinput> 128.8 @@ -6,3 +7,4 @@ 128.9 <prompt>$</prompt> <userinput>hg commit -m'first change'</userinput> 128.10 <prompt>$</prompt> <userinput>hg qinit</userinput> 128.11 </screen> 128.12 +<!-- END mq.tutorial.qinit -->
129.1 --- a/en/examples/results/mq.tutorial.qnew.out Tue Mar 31 12:18:22 2009 -0700 129.2 +++ b/en/examples/results/mq.tutorial.qnew.out Tue Mar 31 12:19:01 2009 -0700 129.3 @@ -1,3 +1,4 @@ 129.4 +<!-- BEGIN mq.tutorial.qnew --> 129.5 <screen><prompt>$</prompt> <userinput>hg tip</userinput> 129.6 changeset: 129.7 tag: tip 129.8 @@ -19,3 +20,4 @@ 129.9 <prompt>$</prompt> <userinput>ls .hg/patches</userinput> 129.10 first.patch series status 129.11 </screen> 129.12 +<!-- END mq.tutorial.qnew -->
130.1 --- a/en/examples/results/mq.tutorial.qnew2.out Tue Mar 31 12:18:22 2009 -0700 130.2 +++ b/en/examples/results/mq.tutorial.qnew2.out Tue Mar 31 12:19:01 2009 -0700 130.3 @@ -1,15 +1,16 @@ 130.4 +<!-- BEGIN mq.tutorial.qnew2 --> 130.5 <screen><prompt>$</prompt> <userinput>hg qnew second.patch</userinput> 130.6 <prompt>$</prompt> <userinput>hg log --style=compact --limit=2</userinput> 130.7 -2[qtip,second.patch,tip] 2009-03-10 04:38 +0000 bos 130.8 +2[qtip,second.patch,tip] 2009-03-31 19:08 +0000 bos 130.9 [mq]: second.patch 130.10 130.11 -1[first.patch,qbase] 2009-03-10 04:38 +0000 bos 130.12 +1[first.patch,qbase] 2009-03-31 19:08 +0000 bos 130.13 [mq]: first.patch 130.14 130.15 <prompt>$</prompt> <userinput>echo 'line 4' >> file1</userinput> 130.16 <prompt>$</prompt> <userinput>hg qrefresh</userinput> 130.17 <prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput> 130.18 -2[qtip,second.patch,tip] 2009-03-10 04:38 +0000 bos 130.19 +2[qtip,second.patch,tip] 2009-03-31 19:08 +0000 bos 130.20 [mq]: second.patch 130.21 130.22 diff -r -r file1 130.23 @@ -27,3 +28,4 @@ 130.24 1: line 3 130.25 2: line 4 130.26 </screen> 130.27 +<!-- END mq.tutorial.qnew2 -->
131.1 --- a/en/examples/results/mq.tutorial.qpop.out Tue Mar 31 12:18:22 2009 -0700 131.2 +++ b/en/examples/results/mq.tutorial.qpop.out Tue Mar 31 12:19:01 2009 -0700 131.3 @@ -1,3 +1,4 @@ 131.4 +<!-- BEGIN mq.tutorial.qpop --> 131.5 <screen><prompt>$</prompt> <userinput>hg qapplied</userinput> 131.6 first.patch 131.7 second.patch 131.8 @@ -13,3 +14,4 @@ 131.9 line 2 131.10 line 3 131.11 </screen> 131.12 +<!-- END mq.tutorial.qpop -->
132.1 --- a/en/examples/results/mq.tutorial.qpush-a.out Tue Mar 31 12:18:22 2009 -0700 132.2 +++ b/en/examples/results/mq.tutorial.qpush-a.out Tue Mar 31 12:19:01 2009 -0700 132.3 @@ -1,3 +1,4 @@ 132.4 +<!-- BEGIN mq.tutorial.qpush-a --> 132.5 <screen><prompt>$</prompt> <userinput>hg qpush -a</userinput> 132.6 applying second.patch 132.7 now at: second.patch 132.8 @@ -7,3 +8,4 @@ 132.9 line 3 132.10 line 4 132.11 </screen> 132.12 +<!-- END mq.tutorial.qpush-a -->
133.1 --- a/en/examples/results/mq.tutorial.qrefresh.out Tue Mar 31 12:18:22 2009 -0700 133.2 +++ b/en/examples/results/mq.tutorial.qrefresh.out Tue Mar 31 12:19:01 2009 -0700 133.3 @@ -1,3 +1,4 @@ 133.4 +<!-- BEGIN mq.tutorial.qrefresh --> 133.5 <screen><prompt>$</prompt> <userinput>echo 'line 2' >> file1</userinput> 133.6 <prompt>$</prompt> <userinput>hg diff</userinput> 133.7 diff -r file1 133.8 @@ -9,7 +10,7 @@ 133.9 <prompt>$</prompt> <userinput>hg qrefresh</userinput> 133.10 <prompt>$</prompt> <userinput>hg diff</userinput> 133.11 <prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput> 133.12 -1[qtip,first.patch,tip,qbase] 2009-03-10 04:38 +0000 bos 133.13 +1[qtip,first.patch,tip,qbase] 2009-03-31 19:08 +0000 bos 133.14 [mq]: first.patch 133.15 133.16 diff -r -r file1 133.17 @@ -20,3 +21,4 @@ 133.18 +line 2 133.19 133.20 </screen> 133.21 +<!-- END mq.tutorial.qrefresh -->
134.1 --- a/en/examples/results/mq.tutorial.qrefresh2.out Tue Mar 31 12:18:22 2009 -0700 134.2 +++ b/en/examples/results/mq.tutorial.qrefresh2.out Tue Mar 31 12:19:01 2009 -0700 134.3 @@ -1,9 +1,10 @@ 134.4 +<!-- BEGIN mq.tutorial.qrefresh2 --> 134.5 <screen><prompt>$</prompt> <userinput>echo 'line 3' >> file1</userinput> 134.6 <prompt>$</prompt> <userinput>hg status</userinput> 134.7 M file1 134.8 <prompt>$</prompt> <userinput>hg qrefresh</userinput> 134.9 <prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput> 134.10 -1[qtip,first.patch,tip,qbase] 2009-03-10 04:38 +0000 bos 134.11 +1[qtip,first.patch,tip,qbase] 2009-03-31 19:08 +0000 bos 134.12 [mq]: first.patch 134.13 134.14 diff -r -r file1 134.15 @@ -15,3 +16,4 @@ 134.16 +line 3 134.17 134.18 </screen> 134.19 +<!-- END mq.tutorial.qrefresh2 -->
135.1 --- a/en/examples/results/mq.tutorial.qseries.out Tue Mar 31 12:18:22 2009 -0700 135.2 +++ b/en/examples/results/mq.tutorial.qseries.out Tue Mar 31 12:19:01 2009 -0700 135.3 @@ -1,3 +1,4 @@ 135.4 +<!-- BEGIN mq.tutorial.qseries --> 135.5 <screen><prompt>$</prompt> <userinput>hg qseries</userinput> 135.6 first.patch 135.7 second.patch 135.8 @@ -5,3 +6,4 @@ 135.9 first.patch 135.10 second.patch 135.11 </screen> 135.12 +<!-- END mq.tutorial.qseries -->
136.1 --- a/en/examples/results/rename.divergent.clone.out Tue Mar 31 12:18:22 2009 -0700 136.2 +++ b/en/examples/results/rename.divergent.clone.out Tue Mar 31 12:19:01 2009 -0700 136.3 @@ -1,3 +1,4 @@ 136.4 +<!-- BEGIN rename.divergent.clone --> 136.5 <screen><prompt>$</prompt> <userinput>hg clone orig anne</userinput> 136.6 updating working directory 136.7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 136.8 @@ -5,3 +6,4 @@ 136.9 updating working directory 136.10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 136.11 </screen> 136.12 +<!-- END rename.divergent.clone -->
137.1 --- a/en/examples/results/rename.divergent.merge.out Tue Mar 31 12:18:22 2009 -0700 137.2 +++ b/en/examples/results/rename.divergent.merge.out Tue Mar 31 12:19:01 2009 -0700 137.3 @@ -1,3 +1,4 @@ 137.4 +<!-- BEGIN rename.divergent.merge --> 137.5 <screen># See http://www.selenic.com/mercurial/bts/issue455 137.6 <prompt>$</prompt> <userinput>cd ../orig</userinput> 137.7 <prompt>$</prompt> <userinput>hg pull -u ../anne</userinput> 137.8 @@ -25,3 +26,4 @@ 137.9 <prompt>$</prompt> <userinput>ls</userinput> 137.10 bar quux 137.11 </screen> 137.12 +<!-- END rename.divergent.merge -->
138.1 --- a/en/examples/results/rename.divergent.rename.anne.out Tue Mar 31 12:18:22 2009 -0700 138.2 +++ b/en/examples/results/rename.divergent.rename.anne.out Tue Mar 31 12:19:01 2009 -0700 138.3 @@ -1,4 +1,6 @@ 138.4 +<!-- BEGIN rename.divergent.rename.anne --> 138.5 <screen><prompt>$</prompt> <userinput>cd anne</userinput> 138.6 <prompt>$</prompt> <userinput>hg mv foo bar</userinput> 138.7 <prompt>$</prompt> <userinput>hg ci -m 'Rename foo to bar'</userinput> 138.8 </screen> 138.9 +<!-- END rename.divergent.rename.anne -->
139.1 --- a/en/examples/results/rename.divergent.rename.bob.out Tue Mar 31 12:18:22 2009 -0700 139.2 +++ b/en/examples/results/rename.divergent.rename.bob.out Tue Mar 31 12:19:01 2009 -0700 139.3 @@ -1,4 +1,6 @@ 139.4 +<!-- BEGIN rename.divergent.rename.bob --> 139.5 <screen><prompt>$</prompt> <userinput>cd ../bob</userinput> 139.6 <prompt>$</prompt> <userinput>hg mv foo quux</userinput> 139.7 <prompt>$</prompt> <userinput>hg ci -m 'Rename foo to quux'</userinput> 139.8 </screen> 139.9 +<!-- END rename.divergent.rename.bob -->
140.1 --- a/en/examples/results/rollback.add.out Tue Mar 31 12:18:22 2009 -0700 140.2 +++ b/en/examples/results/rollback.add.out Tue Mar 31 12:19:01 2009 -0700 140.3 @@ -1,3 +1,5 @@ 140.4 +<!-- BEGIN rollback.add --> 140.5 <screen><prompt>$</prompt> <userinput>hg add b</userinput> 140.6 <prompt>$</prompt> <userinput>hg commit -m 'Add file b, this time for real'</userinput> 140.7 </screen> 140.8 +<!-- END rollback.add -->
141.1 --- a/en/examples/results/rollback.commit.out Tue Mar 31 12:18:22 2009 -0700 141.2 +++ b/en/examples/results/rollback.commit.out Tue Mar 31 12:19:01 2009 -0700 141.3 @@ -1,5 +1,7 @@ 141.4 +<!-- BEGIN rollback.commit --> 141.5 <screen><prompt>$</prompt> <userinput>hg status</userinput> 141.6 M a 141.7 <prompt>$</prompt> <userinput>echo b > b</userinput> 141.8 <prompt>$</prompt> <userinput>hg commit -m 'Add file b'</userinput> 141.9 </screen> 141.10 +<!-- END rollback.commit -->
142.1 --- a/en/examples/results/rollback.rollback.out Tue Mar 31 12:18:22 2009 -0700 142.2 +++ b/en/examples/results/rollback.rollback.out Tue Mar 31 12:19:01 2009 -0700 142.3 @@ -1,3 +1,4 @@ 142.4 +<!-- BEGIN rollback.rollback --> 142.5 <screen><prompt>$</prompt> <userinput>hg rollback</userinput> 142.6 rolling back last transaction 142.7 <prompt>$</prompt> <userinput>hg tip</userinput> 142.8 @@ -11,3 +12,4 @@ 142.9 M a 142.10 ? b 142.11 </screen> 142.12 +<!-- END rollback.rollback -->
143.1 --- a/en/examples/results/rollback.status.out Tue Mar 31 12:18:22 2009 -0700 143.2 +++ b/en/examples/results/rollback.status.out Tue Mar 31 12:19:01 2009 -0700 143.3 @@ -1,3 +1,4 @@ 143.4 +<!-- BEGIN rollback.status --> 143.5 <screen><prompt>$</prompt> <userinput>hg status</userinput> 143.6 ? b 143.7 <prompt>$</prompt> <userinput>hg tip</userinput> 143.8 @@ -8,3 +9,4 @@ 143.9 summary: Add file b 143.10 143.11 </screen> 143.12 +<!-- END rollback.status -->
144.1 --- a/en/examples/results/rollback.tip.out Tue Mar 31 12:18:22 2009 -0700 144.2 +++ b/en/examples/results/rollback.tip.out Tue Mar 31 12:19:01 2009 -0700 144.3 @@ -1,1 +1,3 @@ 144.4 +<!-- BEGIN rollback.tip --> 144.5 <screen></screen> 144.6 +<!-- END rollback.tip -->
145.1 --- a/en/examples/results/rollback.twice.out Tue Mar 31 12:18:22 2009 -0700 145.2 +++ b/en/examples/results/rollback.twice.out Tue Mar 31 12:19:01 2009 -0700 145.3 @@ -1,5 +1,7 @@ 145.4 +<!-- BEGIN rollback.twice --> 145.5 <screen><prompt>$</prompt> <userinput>hg rollback</userinput> 145.6 rolling back last transaction 145.7 <prompt>$</prompt> <userinput>hg rollback</userinput> 145.8 no rollback information available 145.9 </screen> 145.10 +<!-- END rollback.twice -->
146.1 --- a/en/examples/results/tag.init.out Tue Mar 31 12:18:22 2009 -0700 146.2 +++ b/en/examples/results/tag.init.out Tue Mar 31 12:19:01 2009 -0700 146.3 @@ -1,6 +1,8 @@ 146.4 +<!-- BEGIN tag.init --> 146.5 <screen><prompt>$</prompt> <userinput>hg init mytag</userinput> 146.6 <prompt>$</prompt> <userinput>cd mytag</userinput> 146.7 <prompt>$</prompt> <userinput>echo hello > myfile</userinput> 146.8 <prompt>$</prompt> <userinput>hg commit -A -m 'Initial commit'</userinput> 146.9 adding myfile 146.10 </screen> 146.11 +<!-- END tag.init -->
147.1 --- a/en/examples/results/tag.log.out Tue Mar 31 12:18:22 2009 -0700 147.2 +++ b/en/examples/results/tag.log.out Tue Mar 31 12:19:01 2009 -0700 147.3 @@ -1,3 +1,4 @@ 147.4 +<!-- BEGIN tag.log --> 147.5 <screen><prompt>$</prompt> <userinput>hg log</userinput> 147.6 changeset: 147.7 tag: tip 147.8 @@ -12,3 +13,4 @@ 147.9 summary: Initial commit 147.10 147.11 </screen> 147.12 +<!-- END tag.log -->
148.1 --- a/en/examples/results/tag.log.v1.0.out Tue Mar 31 12:18:22 2009 -0700 148.2 +++ b/en/examples/results/tag.log.v1.0.out Tue Mar 31 12:19:01 2009 -0700 148.3 @@ -1,3 +1,4 @@ 148.4 +<!-- BEGIN tag.log.v1.0 --> 148.5 <screen><prompt>$</prompt> <userinput>echo goodbye > myfile2</userinput> 148.6 <prompt>$</prompt> <userinput>hg commit -A -m 'Second commit'</userinput> 148.7 adding myfile2 148.8 @@ -9,3 +10,4 @@ 148.9 summary: Initial commit 148.10 148.11 </screen> 148.12 +<!-- END tag.log.v1.0 -->
149.1 --- a/en/examples/results/tag.remove.out Tue Mar 31 12:18:22 2009 -0700 149.2 +++ b/en/examples/results/tag.remove.out Tue Mar 31 12:19:01 2009 -0700 149.3 @@ -1,4 +1,6 @@ 149.4 +<!-- BEGIN tag.remove --> 149.5 <screen><prompt>$</prompt> <userinput>hg tag --remove v1.0</userinput> 149.6 <prompt>$</prompt> <userinput>hg tags</userinput> 149.7 tip 149.8 </screen> 149.9 +<!-- END tag.remove -->
150.1 --- a/en/examples/results/tag.replace.out Tue Mar 31 12:18:22 2009 -0700 150.2 +++ b/en/examples/results/tag.replace.out Tue Mar 31 12:19:01 2009 -0700 150.3 @@ -1,3 +1,4 @@ 150.4 +<!-- BEGIN tag.replace --> 150.5 <screen><prompt>$</prompt> <userinput>hg tag -r 1 v1.1</userinput> 150.6 <prompt>$</prompt> <userinput>hg tags</userinput> 150.7 tip 150.8 @@ -9,3 +10,4 @@ 150.9 tip 150.10 v1.1 150.11 </screen> 150.12 +<!-- END tag.replace -->
151.1 --- a/en/examples/results/tag.tag.out Tue Mar 31 12:18:22 2009 -0700 151.2 +++ b/en/examples/results/tag.tag.out Tue Mar 31 12:19:01 2009 -0700 151.3 @@ -1,2 +1,4 @@ 151.4 +<!-- BEGIN tag.tag --> 151.5 <screen><prompt>$</prompt> <userinput>hg tag v1.0</userinput> 151.6 </screen> 151.7 +<!-- END tag.tag -->
152.1 --- a/en/examples/results/tag.tags.out Tue Mar 31 12:18:22 2009 -0700 152.2 +++ b/en/examples/results/tag.tags.out Tue Mar 31 12:19:01 2009 -0700 152.3 @@ -1,4 +1,6 @@ 152.4 +<!-- BEGIN tag.tags --> 152.5 <screen><prompt>$</prompt> <userinput>hg tags</userinput> 152.6 tip 152.7 v1.0 152.8 </screen> 152.9 +<!-- END tag.tags -->
153.1 --- a/en/examples/results/tag.tip.out Tue Mar 31 12:18:22 2009 -0700 153.2 +++ b/en/examples/results/tag.tip.out Tue Mar 31 12:19:01 2009 -0700 153.3 @@ -1,3 +1,4 @@ 153.4 +<!-- BEGIN tag.tip --> 153.5 <screen><prompt>$</prompt> <userinput>hg tip</userinput> 153.6 changeset: 153.7 tag: tip 153.8 @@ -6,3 +7,4 @@ 153.9 summary: Added tag v1.1 for changeset 153.10 153.11 </screen> 153.12 +<!-- END tag.tip -->
154.1 --- a/en/examples/results/template.simple.changelog.out Tue Mar 31 12:18:22 2009 -0700 154.2 +++ b/en/examples/results/template.simple.changelog.out Tue Mar 31 12:19:01 2009 -0700 154.3 @@ -21,3 +21,5 @@ 154.4 154.5 154.6 154.7 + 154.8 +
155.1 --- a/en/examples/results/template.simple.combine.out Tue Mar 31 12:18:22 2009 -0700 155.2 +++ b/en/examples/results/template.simple.combine.out Tue Mar 31 12:19:01 2009 -0700 155.3 @@ -5,3 +5,5 @@ 155.4 155.5 155.6 155.7 + 155.8 +
156.1 --- a/en/examples/results/template.simple.compact.out Tue Mar 31 12:18:22 2009 -0700 156.2 +++ b/en/examples/results/template.simple.compact.out Tue Mar 31 12:19:01 2009 -0700 156.3 @@ -12,3 +12,5 @@ 156.4 156.5 156.6 156.7 + 156.8 +
157.1 --- a/en/examples/results/template.simple.datekeyword.out Tue Mar 31 12:18:22 2009 -0700 157.2 +++ b/en/examples/results/template.simple.datekeyword.out Tue Mar 31 12:19:01 2009 -0700 157.3 @@ -3,3 +3,5 @@ 157.4 157.5 157.6 157.7 + 157.8 +
158.1 --- a/en/examples/results/template.simple.keywords.out Tue Mar 31 12:18:22 2009 -0700 158.2 +++ b/en/examples/results/template.simple.keywords.out Tue Mar 31 12:19:01 2009 -0700 158.3 @@ -20,3 +20,5 @@ 158.4 158.5 158.6 158.7 + 158.8 +
159.1 --- a/en/examples/results/template.simple.manyfilters.out Tue Mar 31 12:18:22 2009 -0700 159.2 +++ b/en/examples/results/template.simple.manyfilters.out Tue Mar 31 12:19:01 2009 -0700 159.3 @@ -61,3 +61,5 @@ 159.4 159.5 159.6 159.7 + 159.8 +
160.1 --- a/en/examples/results/template.simple.normal.out Tue Mar 31 12:18:22 2009 -0700 160.2 +++ b/en/examples/results/template.simple.normal.out Tue Mar 31 12:19:01 2009 -0700 160.3 @@ -6,3 +6,5 @@ 160.4 160.5 160.6 160.7 + 160.8 +
161.1 --- a/en/examples/results/template.simple.rev.out Tue Mar 31 12:18:22 2009 -0700 161.2 +++ b/en/examples/results/template.simple.rev.out Tue Mar 31 12:19:01 2009 -0700 161.3 @@ -2,3 +2,5 @@ 161.4 161.5 161.6 161.7 + 161.8 +
162.1 --- a/en/examples/results/template.simple.simplest.out Tue Mar 31 12:18:22 2009 -0700 162.2 +++ b/en/examples/results/template.simple.simplest.out Tue Mar 31 12:19:01 2009 -0700 162.3 @@ -1,3 +1,5 @@ 162.4 162.5 162.6 162.7 + 162.8 +
163.1 --- a/en/examples/results/template.simple.simplesub.out Tue Mar 31 12:18:22 2009 -0700 163.2 +++ b/en/examples/results/template.simple.simplesub.out Tue Mar 31 12:19:01 2009 -0700 163.3 @@ -6,3 +6,5 @@ 163.4 163.5 163.6 163.7 + 163.8 +
164.1 --- a/en/examples/results/template.svnstyle.id.out Tue Mar 31 12:18:22 2009 -0700 164.2 +++ b/en/examples/results/template.svnstyle.id.out Tue Mar 31 12:19:01 2009 -0700 164.3 @@ -1,2 +1,4 @@ 164.4 +<!-- BEGIN template.svnstyle.id --> 164.5 <screen><prompt>$</prompt> <userinput>hg log -r0 --template '{node}'</userinput> 164.6 </screen> 164.7 +<!-- END template.svnstyle.id -->
165.1 --- a/en/examples/results/template.svnstyle.result.out Tue Mar 31 12:18:22 2009 -0700 165.2 +++ b/en/examples/results/template.svnstyle.result.out Tue Mar 31 12:19:01 2009 -0700 165.3 @@ -1,3 +1,4 @@ 165.4 +<!-- BEGIN template.svnstyle.result --> 165.5 <screen><prompt>$</prompt> <userinput>hg log -r1 --style svn.style</userinput> 165.6 ------------------------------------------------------------------------ 165.7 165.8 @@ -10,3 +11,4 @@ 165.9 165.10 ------------------------------------------------------------------------ 165.11 </screen> 165.12 +<!-- END template.svnstyle.result -->
166.1 --- a/en/examples/results/template.svnstyle.short.out Tue Mar 31 12:18:22 2009 -0700 166.2 +++ b/en/examples/results/template.svnstyle.short.out Tue Mar 31 12:19:01 2009 -0700 166.3 @@ -1,3 +1,4 @@ 166.4 +<!-- BEGIN template.svnstyle.short --> 166.5 <screen><prompt>$</prompt> <userinput>svn log -r9653</userinput> 166.6 ------------------------------------------------------------------------ 166.7 r9653 | sean.hefty | 2006-09-27 14:39:55 -0700 (Wed, 27 Sep 2006) | 5 lines 166.8 @@ -9,3 +10,4 @@ 166.9 166.10 ------------------------------------------------------------------------ 166.11 </screen> 166.12 +<!-- END template.svnstyle.short -->
167.1 --- a/en/examples/results/template.svnstyle.simplest.out Tue Mar 31 12:18:22 2009 -0700 167.2 +++ b/en/examples/results/template.svnstyle.simplest.out Tue Mar 31 12:19:01 2009 -0700 167.3 @@ -1,5 +1,7 @@ 167.4 +<!-- BEGIN template.svnstyle.simplest --> 167.5 <screen><prompt>$</prompt> <userinput>cat svn.style</userinput> 167.6 changeset = "{node|short}\n" 167.7 <prompt>$</prompt> <userinput>hg log -r1 --style svn.style</userinput> 167.8 167.9 </screen> 167.10 +<!-- END template.svnstyle.simplest -->
168.1 --- a/en/examples/results/template.svnstyle.style.out Tue Mar 31 12:18:22 2009 -0700 168.2 +++ b/en/examples/results/template.svnstyle.style.out Tue Mar 31 12:19:01 2009 -0700 168.3 @@ -1,4 +1,6 @@ 168.4 +<!-- BEGIN template.svnstyle.style --> 168.5 <screen><prompt>$</prompt> <userinput>cat svn.style</userinput> 168.6 header = '------------------------------------------------------------------------\n\n' 168.7 changeset = svn.template 168.8 </screen> 168.9 +<!-- END template.svnstyle.style -->
169.1 --- a/en/examples/results/template.svnstyle.syntax.error.out Tue Mar 31 12:18:22 2009 -0700 169.2 +++ b/en/examples/results/template.svnstyle.syntax.error.out Tue Mar 31 12:19:01 2009 -0700 169.3 @@ -1,3 +1,5 @@ 169.4 +<!-- BEGIN template.svnstyle.syntax.error --> 169.5 <screen><prompt>$</prompt> <userinput>hg log -r1 --style broken.style</userinput> 169.6 abort: broken.style:1: parse error 169.7 </screen> 169.8 +<!-- END template.svnstyle.syntax.error -->
170.1 --- a/en/examples/results/template.svnstyle.syntax.input.out Tue Mar 31 12:18:22 2009 -0700 170.2 +++ b/en/examples/results/template.svnstyle.syntax.input.out Tue Mar 31 12:19:01 2009 -0700 170.3 @@ -1,3 +1,5 @@ 170.4 +<!-- BEGIN template.svnstyle.syntax.input --> 170.5 <screen><prompt>$</prompt> <userinput>cat broken.style</userinput> 170.6 changeset = 170.7 </screen> 170.8 +<!-- END template.svnstyle.syntax.input -->
171.1 --- a/en/examples/results/template.svnstyle.template.out Tue Mar 31 12:18:22 2009 -0700 171.2 +++ b/en/examples/results/template.svnstyle.template.out Tue Mar 31 12:19:01 2009 -0700 171.3 @@ -1,3 +1,4 @@ 171.4 +<!-- BEGIN template.svnstyle.template --> 171.5 <screen><prompt>$</prompt> <userinput>cat svn.template</userinput> 171.6 r{rev} | {author|user} | {date|isodate} ({date|rfc822date}) 171.7 171.8 @@ -5,3 +6,4 @@ 171.9 171.10 ------------------------------------------------------------------------ 171.11 </screen> 171.12 +<!-- END template.svnstyle.template -->
172.1 --- a/en/examples/results/tour-merge-conflict.commit.out Tue Mar 31 12:18:22 2009 -0700 172.2 +++ b/en/examples/results/tour-merge-conflict.commit.out Tue Mar 31 12:19:01 2009 -0700 172.3 @@ -1,3 +1,4 @@ 172.4 +<!-- BEGIN tour-merge-conflict.commit --> 172.5 <screen><prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput> 172.6 <prompt>></prompt> <userinput>Greetings!</userinput> 172.7 <prompt>></prompt> <userinput>I am Bryan O'Sullivan, no relation of the former</userinput> 172.8 @@ -15,3 +16,4 @@ 172.9 summary: Send me your money 172.10 172.11 </screen> 172.12 +<!-- END tour-merge-conflict.commit -->
173.1 --- a/en/examples/results/tour-merge-conflict.cousin.out Tue Mar 31 12:18:22 2009 -0700 173.2 +++ b/en/examples/results/tour-merge-conflict.cousin.out Tue Mar 31 12:19:01 2009 -0700 173.3 @@ -1,3 +1,4 @@ 173.4 +<!-- BEGIN tour-merge-conflict.cousin --> 173.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 173.6 <prompt>$</prompt> <userinput>hg clone scam scam-cousin</userinput> 173.7 updating working directory 173.8 @@ -10,3 +11,4 @@ 173.9 <prompt>></prompt> <userinput>EOF</userinput> 173.10 <prompt>$</prompt> <userinput>hg commit -m '419 scam, with cousin'</userinput> 173.11 </screen> 173.12 +<!-- END tour-merge-conflict.cousin -->
174.1 --- a/en/examples/results/tour-merge-conflict.merge.out Tue Mar 31 12:18:22 2009 -0700 174.2 +++ b/en/examples/results/tour-merge-conflict.merge.out Tue Mar 31 12:19:01 2009 -0700 174.3 @@ -1,3 +1,4 @@ 174.4 +<!-- BEGIN tour-merge-conflict.merge --> 174.5 <screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput> 174.6 <prompt>$</prompt> <userinput>echo 'XXX this is broken and must be fixed'</userinput> 174.7 XXX this is broken and must be fixed 174.8 @@ -6,13 +7,14 @@ 174.9 merge: warning: conflicts during merge 174.10 merging letter.txt failed! 174.11 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 174.12 -use 'hg resolve' to retry unresolved file merges 174.13 +use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon 174.14 <prompt>$</prompt> <userinput>cat letter.txt</userinput> 174.15 Greetings! 174.16 -<<<<<<< /tmp/tour-merge-conflictBrdfE0/scam-merge/letter.txt 174.17 +<<<<<<< /tmp/tour-merge-conflictP17yO-/scam-merge/letter.txt 174.18 I am Shehu Musa Abacha, cousin to the former 174.19 ======= 174.20 I am Alhaji Abba Abacha, son of the former 174.21 ->>>>>>> /tmp/letter.txt~other.1ctEYy 174.22 +>>>>>>> /tmp/letter.txt~other.EVdwH3 174.23 Nigerian dictator Sani Abacha. 174.24 </screen> 174.25 +<!-- END tour-merge-conflict.merge -->
175.1 --- a/en/examples/results/tour-merge-conflict.pull.out Tue Mar 31 12:18:22 2009 -0700 175.2 +++ b/en/examples/results/tour-merge-conflict.pull.out Tue Mar 31 12:19:01 2009 -0700 175.3 @@ -1,3 +1,4 @@ 175.4 +<!-- BEGIN tour-merge-conflict.pull --> 175.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 175.6 <prompt>$</prompt> <userinput>hg clone scam-cousin scam-merge</userinput> 175.7 updating working directory 175.8 @@ -13,3 +14,4 @@ 175.9 not updating, since new heads added 175.10 (run 'hg heads' to see heads, 'hg merge' to merge) 175.11 </screen> 175.12 +<!-- END tour-merge-conflict.pull -->
176.1 --- a/en/examples/results/tour-merge-conflict.son.out Tue Mar 31 12:18:22 2009 -0700 176.2 +++ b/en/examples/results/tour-merge-conflict.son.out Tue Mar 31 12:19:01 2009 -0700 176.3 @@ -1,3 +1,4 @@ 176.4 +<!-- BEGIN tour-merge-conflict.son --> 176.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 176.6 <prompt>$</prompt> <userinput>hg clone scam scam-son</userinput> 176.7 updating working directory 176.8 @@ -10,3 +11,4 @@ 176.9 <prompt>></prompt> <userinput>EOF</userinput> 176.10 <prompt>$</prompt> <userinput>hg commit -m '419 scam, with son'</userinput> 176.11 </screen> 176.12 +<!-- END tour-merge-conflict.son -->
177.1 --- a/en/examples/results/tour-merge-conflict.wife.out Tue Mar 31 12:18:22 2009 -0700 177.2 +++ b/en/examples/results/tour-merge-conflict.wife.out Tue Mar 31 12:19:01 2009 -0700 177.3 @@ -1,3 +1,4 @@ 177.4 +<!-- BEGIN tour-merge-conflict.wife --> 177.5 <screen><prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput> 177.6 <prompt>></prompt> <userinput>Greetings!</userinput> 177.7 <prompt>></prompt> <userinput>I am Mariam Abacha, the wife of former</userinput> 177.8 @@ -6,3 +7,4 @@ 177.9 <prompt>$</prompt> <userinput>hg add letter.txt</userinput> 177.10 <prompt>$</prompt> <userinput>hg commit -m '419 scam, first draft'</userinput> 177.11 </screen> 177.12 +<!-- END tour-merge-conflict.wife -->
178.1 --- a/en/examples/results/tour.clone-pull.out Tue Mar 31 12:18:22 2009 -0700 178.2 +++ b/en/examples/results/tour.clone-pull.out Tue Mar 31 12:19:01 2009 -0700 178.3 @@ -1,5 +1,7 @@ 178.4 +<!-- BEGIN tour.clone-pull --> 178.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 178.6 <prompt>$</prompt> <userinput>hg clone hello hello-pull</userinput> 178.7 updating working directory 178.8 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 178.9 </screen> 178.10 +<!-- END tour.clone-pull -->
179.1 --- a/en/examples/results/tour.clone-push.out Tue Mar 31 12:18:22 2009 -0700 179.2 +++ b/en/examples/results/tour.clone-push.out Tue Mar 31 12:19:01 2009 -0700 179.3 @@ -1,5 +1,7 @@ 179.4 +<!-- BEGIN tour.clone-push --> 179.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 179.6 <prompt>$</prompt> <userinput>hg clone hello hello-push</userinput> 179.7 updating working directory 179.8 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 179.9 </screen> 179.10 +<!-- END tour.clone-push -->
180.1 --- a/en/examples/results/tour.clone.out Tue Mar 31 12:18:22 2009 -0700 180.2 +++ b/en/examples/results/tour.clone.out Tue Mar 31 12:19:01 2009 -0700 180.3 @@ -1,3 +1,4 @@ 180.4 +<!-- BEGIN tour.clone --> 180.5 <screen><prompt>$</prompt> <userinput>hg clone http://hg.serpentine.com/tutorial/hello</userinput> 180.6 destination directory: hello 180.7 requesting all changes 180.8 @@ -8,3 +9,4 @@ 180.9 updating working directory 180.10 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 180.11 </screen> 180.12 +<!-- END tour.clone -->
181.1 --- a/en/examples/results/tour.commit.out Tue Mar 31 12:18:22 2009 -0700 181.2 +++ b/en/examples/results/tour.commit.out Tue Mar 31 12:19:01 2009 -0700 181.3 @@ -1,2 +1,4 @@ 181.4 +<!-- BEGIN tour.commit --> 181.5 <screen><prompt>$</prompt> <userinput>hg commit</userinput> 181.6 </screen> 181.7 +<!-- END tour.commit -->
182.1 --- a/en/examples/results/tour.diff.out Tue Mar 31 12:18:22 2009 -0700 182.2 +++ b/en/examples/results/tour.diff.out Tue Mar 31 12:19:01 2009 -0700 182.3 @@ -1,3 +1,4 @@ 182.4 +<!-- BEGIN tour.diff --> 182.5 <screen><prompt>$</prompt> <userinput>hg diff</userinput> 182.6 diff -r hello.c 182.7 182.8 @@ -10,3 +11,4 @@ 182.9 return 0; 182.10 } 182.11 </screen> 182.12 +<!-- END tour.diff -->
183.1 --- a/en/examples/results/tour.help.out Tue Mar 31 12:18:22 2009 -0700 183.2 +++ b/en/examples/results/tour.help.out Tue Mar 31 12:19:01 2009 -0700 183.3 @@ -1,3 +1,4 @@ 183.4 +<!-- BEGIN tour.help --> 183.5 <screen><prompt>$</prompt> <userinput>hg help init</userinput> 183.6 hg init [-e CMD] [--remotecmd CMD] [DEST] 183.7 183.8 @@ -18,3 +19,4 @@ 183.9 183.10 use "hg -v help init" to show global options 183.11 </screen> 183.12 +<!-- END tour.help -->
184.1 --- a/en/examples/results/tour.incoming.out Tue Mar 31 12:18:22 2009 -0700 184.2 +++ b/en/examples/results/tour.incoming.out Tue Mar 31 12:19:01 2009 -0700 184.3 @@ -1,3 +1,4 @@ 184.4 +<!-- BEGIN tour.incoming --> 184.5 <screen><prompt>$</prompt> <userinput>cd hello-pull</userinput> 184.6 <prompt>$</prompt> <userinput>hg incoming ../my-hello</userinput> 184.7 comparing with ../my-hello 184.8 @@ -9,3 +10,4 @@ 184.9 summary: Added an extra line of output 184.10 184.11 </screen> 184.12 +<!-- END tour.incoming -->
185.1 --- a/en/examples/results/tour.log-r.out Tue Mar 31 12:18:22 2009 -0700 185.2 +++ b/en/examples/results/tour.log-r.out Tue Mar 31 12:19:01 2009 -0700 185.3 @@ -1,3 +1,4 @@ 185.4 +<!-- BEGIN tour.log-r --> 185.5 <screen><prompt>$</prompt> <userinput>hg log -r 3</userinput> 185.6 changeset: 185.7 user: Bryan O'Sullivan <bos@serpentine.com> 185.8 @@ -23,3 +24,4 @@ 185.9 summary: Trim comments. 185.10 185.11 </screen> 185.12 +<!-- END tour.log-r -->
186.1 --- a/en/examples/results/tour.log-v.out Tue Mar 31 12:18:22 2009 -0700 186.2 +++ b/en/examples/results/tour.log-v.out Tue Mar 31 12:19:01 2009 -0700 186.3 @@ -1,3 +1,4 @@ 186.4 +<!-- BEGIN tour.log-v --> 186.5 <screen><prompt>$</prompt> <userinput>hg log -v -r 3</userinput> 186.6 changeset: 186.7 user: Bryan O'Sullivan <bos@serpentine.com> 186.8 @@ -8,3 +9,4 @@ 186.9 186.10 186.11 </screen> 186.12 +<!-- END tour.log-v -->
187.1 --- a/en/examples/results/tour.log-vp.out Tue Mar 31 12:18:22 2009 -0700 187.2 +++ b/en/examples/results/tour.log-vp.out Tue Mar 31 12:19:01 2009 -0700 187.3 @@ -1,3 +1,4 @@ 187.4 +<!-- BEGIN tour.log-vp --> 187.5 <screen><prompt>$</prompt> <userinput>hg log -v -p -r 2</userinput> 187.6 changeset: 187.7 user: Bryan O'Sullivan <bos@serpentine.com> 187.8 @@ -20,3 +21,4 @@ 187.9 } 187.10 187.11 </screen> 187.12 +<!-- END tour.log-vp -->
188.1 --- a/en/examples/results/tour.log.out Tue Mar 31 12:18:22 2009 -0700 188.2 +++ b/en/examples/results/tour.log.out Tue Mar 31 12:19:01 2009 -0700 188.3 @@ -1,3 +1,4 @@ 188.4 +<!-- BEGIN tour.log --> 188.5 <screen><prompt>$</prompt> <userinput>hg log</userinput> 188.6 changeset: 188.7 tag: tip 188.8 @@ -26,3 +27,4 @@ 188.9 summary: Create a standard "hello, world" program 188.10 188.11 </screen> 188.12 +<!-- END tour.log -->
189.1 --- a/en/examples/results/tour.log.range.out Tue Mar 31 12:18:22 2009 -0700 189.2 +++ b/en/examples/results/tour.log.range.out Tue Mar 31 12:19:01 2009 -0700 189.3 @@ -1,3 +1,4 @@ 189.4 +<!-- BEGIN tour.log.range --> 189.5 <screen><prompt>$</prompt> <userinput>hg log -r 2:4</userinput> 189.6 changeset: 189.7 user: Bryan O'Sullivan <bos@serpentine.com> 189.8 @@ -16,3 +17,4 @@ 189.9 summary: Trim comments. 189.10 189.11 </screen> 189.12 +<!-- END tour.log.range -->
190.1 --- a/en/examples/results/tour.ls-a.out Tue Mar 31 12:18:22 2009 -0700 190.2 +++ b/en/examples/results/tour.ls-a.out Tue Mar 31 12:19:01 2009 -0700 190.3 @@ -1,4 +1,6 @@ 190.4 +<!-- BEGIN tour.ls-a --> 190.5 <screen><prompt>$</prompt> <userinput>cd hello</userinput> 190.6 <prompt>$</prompt> <userinput>ls -a</userinput> 190.7 . .. .hg Makefile hello.c 190.8 </screen> 190.9 +<!-- END tour.ls-a -->
191.1 --- a/en/examples/results/tour.ls.out Tue Mar 31 12:18:22 2009 -0700 191.2 +++ b/en/examples/results/tour.ls.out Tue Mar 31 12:19:01 2009 -0700 191.3 @@ -1,6 +1,8 @@ 191.4 +<!-- BEGIN tour.ls --> 191.5 <screen><prompt>$</prompt> <userinput>ls -l</userinput> 191.6 191.7 191.8 <prompt>$</prompt> <userinput>ls hello</userinput> 191.9 Makefile hello.c 191.10 </screen> 191.11 +<!-- END tour.ls -->
192.1 --- a/en/examples/results/tour.merge.cat.out Tue Mar 31 12:18:22 2009 -0700 192.2 +++ b/en/examples/results/tour.merge.cat.out Tue Mar 31 12:19:01 2009 -0700 192.3 @@ -1,3 +1,4 @@ 192.4 +<!-- BEGIN tour.merge.cat --> 192.5 <screen><prompt>$</prompt> <userinput>cat hello.c</userinput> 192.6 /* 192.7 * Placed in the public domain by Bryan O'Sullivan. This program is 192.8 @@ -27,3 +28,4 @@ 192.9 return 0; 192.10 } 192.11 </screen> 192.12 +<!-- END tour.merge.cat -->
193.1 --- a/en/examples/results/tour.merge.clone.out Tue Mar 31 12:18:22 2009 -0700 193.2 +++ b/en/examples/results/tour.merge.clone.out Tue Mar 31 12:19:01 2009 -0700 193.3 @@ -1,3 +1,4 @@ 193.4 +<!-- BEGIN tour.merge.clone --> 193.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 193.6 <prompt>$</prompt> <userinput>hg clone hello my-new-hello</userinput> 193.7 updating working directory 193.8 @@ -6,3 +7,4 @@ 193.9 <prompt>$</prompt> <userinput>sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c</userinput> 193.10 <prompt>$</prompt> <userinput>hg commit -m 'A new hello for a new day.'</userinput> 193.11 </screen> 193.12 +<!-- END tour.merge.clone -->
194.1 --- a/en/examples/results/tour.merge.commit.out Tue Mar 31 12:18:22 2009 -0700 194.2 +++ b/en/examples/results/tour.merge.commit.out Tue Mar 31 12:19:01 2009 -0700 194.3 @@ -1,2 +1,4 @@ 194.4 +<!-- BEGIN tour.merge.commit --> 194.5 <screen><prompt>$</prompt> <userinput>hg commit -m 'Merged changes'</userinput> 194.6 </screen> 194.7 +<!-- END tour.merge.commit -->
195.1 --- a/en/examples/results/tour.merge.heads.out Tue Mar 31 12:18:22 2009 -0700 195.2 +++ b/en/examples/results/tour.merge.heads.out Tue Mar 31 12:19:01 2009 -0700 195.3 @@ -1,3 +1,4 @@ 195.4 +<!-- BEGIN tour.merge.heads --> 195.5 <screen><prompt>$</prompt> <userinput>hg heads</userinput> 195.6 changeset: 195.7 tag: tip 195.8 @@ -12,3 +13,4 @@ 195.9 summary: A new hello for a new day. 195.10 195.11 </screen> 195.12 +<!-- END tour.merge.heads -->
196.1 --- a/en/examples/results/tour.merge.merge.out Tue Mar 31 12:18:22 2009 -0700 196.2 +++ b/en/examples/results/tour.merge.merge.out Tue Mar 31 12:19:01 2009 -0700 196.3 @@ -1,5 +1,7 @@ 196.4 +<!-- BEGIN tour.merge.merge --> 196.5 <screen><prompt>$</prompt> <userinput>hg merge</userinput> 196.6 merging hello.c 196.7 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 196.8 (branch merge, don't forget to commit) 196.9 </screen> 196.10 +<!-- END tour.merge.merge -->
197.1 --- a/en/examples/results/tour.merge.parents.out Tue Mar 31 12:18:22 2009 -0700 197.2 +++ b/en/examples/results/tour.merge.parents.out Tue Mar 31 12:19:01 2009 -0700 197.3 @@ -1,3 +1,4 @@ 197.4 +<!-- BEGIN tour.merge.parents --> 197.5 <screen><prompt>$</prompt> <userinput>hg parents</userinput> 197.6 changeset: 197.7 user: Bryan O'Sullivan <bos@serpentine.com> 197.8 @@ -27,3 +28,4 @@ 197.9 return 0; 197.10 } 197.11 </screen> 197.12 +<!-- END tour.merge.parents -->
198.1 --- a/en/examples/results/tour.merge.pull.out Tue Mar 31 12:18:22 2009 -0700 198.2 +++ b/en/examples/results/tour.merge.pull.out Tue Mar 31 12:19:01 2009 -0700 198.3 @@ -1,3 +1,4 @@ 198.4 +<!-- BEGIN tour.merge.pull --> 198.5 <screen><prompt>$</prompt> <userinput>hg pull ../my-hello</userinput> 198.6 pulling from ../my-hello 198.7 searching for changes 198.8 @@ -7,3 +8,4 @@ 198.9 added 1 changesets with 1 changes to 1 files (+1 heads) 198.10 (run 'hg heads' to see heads, 'hg merge' to merge) 198.11 </screen> 198.12 +<!-- END tour.merge.pull -->
199.1 --- a/en/examples/results/tour.merge.tip.out Tue Mar 31 12:18:22 2009 -0700 199.2 +++ b/en/examples/results/tour.merge.tip.out Tue Mar 31 12:19:01 2009 -0700 199.3 @@ -1,3 +1,4 @@ 199.4 +<!-- BEGIN tour.merge.tip --> 199.5 <screen><prompt>$</prompt> <userinput>hg tip</userinput> 199.6 changeset: 199.7 tag: tip 199.8 @@ -8,3 +9,4 @@ 199.9 summary: Merged changes 199.10 199.11 </screen> 199.12 +<!-- END tour.merge.tip -->
200.1 --- a/en/examples/results/tour.merge.update.out Tue Mar 31 12:18:22 2009 -0700 200.2 +++ b/en/examples/results/tour.merge.update.out Tue Mar 31 12:19:01 2009 -0700 200.3 @@ -1,3 +1,5 @@ 200.4 +<!-- BEGIN tour.merge.update --> 200.5 <screen><prompt>$</prompt> <userinput>hg update</userinput> 200.6 abort: crosses branches (use 'hg merge' or 'hg update -C') 200.7 </screen> 200.8 +<!-- END tour.merge.update -->
201.1 --- a/en/examples/results/tour.older.out Tue Mar 31 12:18:22 2009 -0700 201.2 +++ b/en/examples/results/tour.older.out Tue Mar 31 12:19:01 2009 -0700 201.3 @@ -1,3 +1,4 @@ 201.4 +<!-- BEGIN tour.older --> 201.5 <screen><prompt>$</prompt> <userinput>hg update 2</userinput> 201.6 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 201.7 <prompt>$</prompt> <userinput>hg parents</userinput> 201.8 @@ -9,3 +10,4 @@ 201.9 <prompt>$</prompt> <userinput>hg update</userinput> 201.10 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 201.11 </screen> 201.12 +<!-- END tour.older -->
202.1 --- a/en/examples/results/tour.outgoing.net.out Tue Mar 31 12:18:22 2009 -0700 202.2 +++ b/en/examples/results/tour.outgoing.net.out Tue Mar 31 12:19:01 2009 -0700 202.3 @@ -1,3 +1,4 @@ 202.4 +<!-- BEGIN tour.outgoing.net --> 202.5 <screen><prompt>$</prompt> <userinput>hg outgoing http://hg.serpentine.com/tutorial/hello</userinput> 202.6 comparing with http://hg.serpentine.com/tutorial/hello 202.7 searching for changes 202.8 @@ -8,3 +9,4 @@ 202.9 summary: Added an extra line of output 202.10 202.11 </screen> 202.12 +<!-- END tour.outgoing.net -->
203.1 --- a/en/examples/results/tour.outgoing.out Tue Mar 31 12:18:22 2009 -0700 203.2 +++ b/en/examples/results/tour.outgoing.out Tue Mar 31 12:19:01 2009 -0700 203.3 @@ -1,3 +1,4 @@ 203.4 +<!-- BEGIN tour.outgoing --> 203.5 <screen><prompt>$</prompt> <userinput>cd my-hello</userinput> 203.6 <prompt>$</prompt> <userinput>hg outgoing ../hello-push</userinput> 203.7 comparing with ../hello-push 203.8 @@ -9,3 +10,4 @@ 203.9 summary: Added an extra line of output 203.10 203.11 </screen> 203.12 +<!-- END tour.outgoing -->
204.1 --- a/en/examples/results/tour.parents.out Tue Mar 31 12:18:22 2009 -0700 204.2 +++ b/en/examples/results/tour.parents.out Tue Mar 31 12:19:01 2009 -0700 204.3 @@ -1,3 +1,4 @@ 204.4 +<!-- BEGIN tour.parents --> 204.5 <screen><prompt>$</prompt> <userinput>hg parents</userinput> 204.6 changeset: 204.7 tag: tip 204.8 @@ -6,3 +7,4 @@ 204.9 summary: Added an extra line of output 204.10 204.11 </screen> 204.12 +<!-- END tour.parents -->
205.1 --- a/en/examples/results/tour.pull.out Tue Mar 31 12:18:22 2009 -0700 205.2 +++ b/en/examples/results/tour.pull.out Tue Mar 31 12:19:01 2009 -0700 205.3 @@ -1,3 +1,4 @@ 205.4 +<!-- BEGIN tour.pull --> 205.5 <screen><prompt>$</prompt> <userinput>hg tip</userinput> 205.6 changeset: 205.7 tag: tip 205.8 @@ -21,3 +22,4 @@ 205.9 summary: Added an extra line of output 205.10 205.11 </screen> 205.12 +<!-- END tour.pull -->
206.1 --- a/en/examples/results/tour.push.net.out Tue Mar 31 12:18:22 2009 -0700 206.2 +++ b/en/examples/results/tour.push.net.out Tue Mar 31 12:19:01 2009 -0700 206.3 @@ -1,5 +1,7 @@ 206.4 +<!-- BEGIN tour.push.net --> 206.5 <screen><prompt>$</prompt> <userinput>hg push http://hg.serpentine.com/tutorial/hello</userinput> 206.6 pushing to http://hg.serpentine.com/tutorial/hello 206.7 searching for changes 206.8 ssl required 206.9 </screen> 206.10 +<!-- END tour.push.net -->
207.1 --- a/en/examples/results/tour.push.nothing.out Tue Mar 31 12:18:22 2009 -0700 207.2 +++ b/en/examples/results/tour.push.nothing.out Tue Mar 31 12:19:01 2009 -0700 207.3 @@ -1,5 +1,7 @@ 207.4 +<!-- BEGIN tour.push.nothing --> 207.5 <screen><prompt>$</prompt> <userinput>hg push ../hello-push</userinput> 207.6 pushing to ../hello-push 207.7 searching for changes 207.8 no changes found 207.9 </screen> 207.10 +<!-- END tour.push.nothing -->
208.1 --- a/en/examples/results/tour.push.out Tue Mar 31 12:18:22 2009 -0700 208.2 +++ b/en/examples/results/tour.push.out Tue Mar 31 12:19:01 2009 -0700 208.3 @@ -1,3 +1,4 @@ 208.4 +<!-- BEGIN tour.push --> 208.5 <screen><prompt>$</prompt> <userinput>hg push ../hello-push</userinput> 208.6 pushing to ../hello-push 208.7 searching for changes 208.8 @@ -6,3 +7,4 @@ 208.9 adding file changes 208.10 added 1 changesets with 1 changes to 1 files 208.11 </screen> 208.12 +<!-- END tour.push -->
209.1 --- a/en/examples/results/tour.reclone.out Tue Mar 31 12:18:22 2009 -0700 209.2 +++ b/en/examples/results/tour.reclone.out Tue Mar 31 12:19:01 2009 -0700 209.3 @@ -1,6 +1,8 @@ 209.4 +<!-- BEGIN tour.reclone --> 209.5 <screen><prompt>$</prompt> <userinput>cd ..</userinput> 209.6 <prompt>$</prompt> <userinput>hg clone hello my-hello</userinput> 209.7 updating working directory 209.8 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 209.9 <prompt>$</prompt> <userinput>cd my-hello</userinput> 209.10 </screen> 209.11 +<!-- END tour.reclone -->
210.1 --- a/en/examples/results/tour.sed.out Tue Mar 31 12:18:22 2009 -0700 210.2 +++ b/en/examples/results/tour.sed.out Tue Mar 31 12:19:01 2009 -0700 210.3 @@ -1,2 +1,4 @@ 210.4 +<!-- BEGIN tour.sed --> 210.5 <screen><prompt>$</prompt> <userinput>sed -i '/printf/a\\tprintf("hello again!\\n");' hello.c</userinput> 210.6 </screen> 210.7 +<!-- END tour.sed -->
211.1 --- a/en/examples/results/tour.status.out Tue Mar 31 12:18:22 2009 -0700 211.2 +++ b/en/examples/results/tour.status.out Tue Mar 31 12:19:01 2009 -0700 211.3 @@ -1,5 +1,7 @@ 211.4 +<!-- BEGIN tour.status --> 211.5 <screen><prompt>$</prompt> <userinput>ls</userinput> 211.6 Makefile hello.c 211.7 <prompt>$</prompt> <userinput>hg status</userinput> 211.8 M hello.c 211.9 </screen> 211.10 +<!-- END tour.status -->
212.1 --- a/en/examples/results/tour.tip.out Tue Mar 31 12:18:22 2009 -0700 212.2 +++ b/en/examples/results/tour.tip.out Tue Mar 31 12:19:01 2009 -0700 212.3 @@ -1,3 +1,4 @@ 212.4 +<!-- BEGIN tour.tip --> 212.5 <screen><prompt>$</prompt> <userinput>hg tip -vp</userinput> 212.6 changeset: 212.7 tag: tip 212.8 @@ -20,3 +21,4 @@ 212.9 } 212.10 212.11 </screen> 212.12 +<!-- END tour.tip -->
213.1 --- a/en/examples/results/tour.update.out Tue Mar 31 12:18:22 2009 -0700 213.2 +++ b/en/examples/results/tour.update.out Tue Mar 31 12:19:01 2009 -0700 213.3 @@ -1,3 +1,4 @@ 213.4 +<!-- BEGIN tour.update --> 213.5 <screen><prompt>$</prompt> <userinput>grep printf hello.c</userinput> 213.6 printf("hello, world!\"); 213.7 <prompt>$</prompt> <userinput>hg update tip</userinput> 213.8 @@ -6,3 +7,4 @@ 213.9 printf("hello, world!\"); 213.10 printf("hello again!\n"); 213.11 </screen> 213.12 +<!-- END tour.update -->
214.1 --- a/en/examples/results/tour.version.out Tue Mar 31 12:18:22 2009 -0700 214.2 +++ b/en/examples/results/tour.version.out Tue Mar 31 12:19:01 2009 -0700 214.3 @@ -1,7 +1,9 @@ 214.4 +<!-- BEGIN tour.version --> 214.5 <screen><prompt>$</prompt> <userinput>hg version</userinput> 214.6 -Mercurial Distributed SCM (version ) 214.7 +Mercurial Distributed SCM (version unknown) 214.8 214.9 -Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others 214.10 +Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others 214.11 This is free software; see the source for copying conditions. There is NO 214.12 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 214.13 </screen> 214.14 +<!-- END tour.version -->