hgbook
changeset 563:44d1363234d2
Move example output files into examples/results
line diff
1.1 --- a/en/examples/backout.init.out Mon Mar 09 21:13:56 2009 -0700 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,7 +0,0 @@ 1.4 -$ \textbf{hg init myrepo} 1.5 -$ \textbf{cd myrepo} 1.6 -$ \textbf{echo first change >> myfile} 1.7 -$ \textbf{hg add myfile} 1.8 -$ \textbf{hg commit -m 'first change'} 1.9 -$ \textbf{echo second change >> myfile} 1.10 -$ \textbf{hg commit -m 'second change'}
2.1 --- a/en/examples/backout.manual.backout.out Mon Mar 09 21:13:56 2009 -0700 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,8 +0,0 @@ 2.4 -$ \textbf{echo third change >> myfile} 2.5 -$ \textbf{hg commit -m 'third change'} 2.6 -$ \textbf{hg backout -m 'back out second change' 1} 2.7 -reverting myfile 2.8 -created new head 2.9 -changeset backs out changeset 2.10 -the backout changeset is a new head - do not forget to merge 2.11 -(use "backout --merge" if you want to auto-merge)
3.1 --- a/en/examples/backout.manual.cat.out Mon Mar 09 21:13:56 2009 -0700 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,4 +0,0 @@ 3.4 -$ \textbf{cat myfile} 3.5 -first change 3.6 -second change 3.7 -third change
4.1 --- a/en/examples/backout.manual.clone.out Mon Mar 09 21:13:56 2009 -0700 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,10 +0,0 @@ 4.4 -$ \textbf{cd ..} 4.5 -$ \textbf{hg clone -r1 myrepo newrepo} 4.6 -requesting all changes 4.7 -adding changesets 4.8 -adding manifests 4.9 -adding file changes 4.10 -added 2 changesets with 2 changes to 1 files 4.11 -updating working directory 4.12 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 4.13 -$ \textbf{cd newrepo}
5.1 --- a/en/examples/backout.manual.heads.out Mon Mar 09 21:13:56 2009 -0700 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,13 +0,0 @@ 5.4 -$ \textbf{hg heads} 5.5 -changeset: 5.6 -tag: tip 5.7 -parent: 5.8 -user: Bryan O'Sullivan <bos@serpentine.com> 5.9 - 5.10 -summary: back out second change 5.11 - 5.12 -changeset: 5.13 -user: Bryan O'Sullivan <bos@serpentine.com> 5.14 - 5.15 -summary: third change 5.16 -
6.1 --- a/en/examples/backout.manual.log.out Mon Mar 09 21:13:56 2009 -0700 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,13 +0,0 @@ 6.4 -$ \textbf{hg log --style compact} 6.5 -3[tip]:1 2009-01-30 06:32 +0000 bos 6.6 - back out second change 6.7 - 6.8 -2 2009-01-30 06:32 +0000 bos 6.9 - third change 6.10 - 6.11 -1 2009-01-30 06:32 +0000 bos 6.12 - second change 6.13 - 6.14 -0 2009-01-30 06:32 +0000 bos 6.15 - first change 6.16 -
7.1 --- a/en/examples/backout.manual.merge.out Mon Mar 09 21:13:56 2009 -0700 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,8 +0,0 @@ 7.4 -$ \textbf{hg merge} 7.5 -merging myfile 7.6 -0 files updated, 1 files merged, 0 files removed, 0 files unresolved 7.7 -(branch merge, don't forget to commit) 7.8 -$ \textbf{hg commit -m 'merged backout with previous tip'} 7.9 -$ \textbf{cat myfile} 7.10 -first change 7.11 -third change
8.1 --- a/en/examples/backout.manual.parents.out Mon Mar 09 21:13:56 2009 -0700 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,6 +0,0 @@ 8.4 -$ \textbf{hg parents} 8.5 -changeset: 8.6 -user: Bryan O'Sullivan <bos@serpentine.com> 8.7 - 8.8 -summary: third change 8.9 -
9.1 --- a/en/examples/backout.non-tip.backout.out Mon Mar 09 21:13:56 2009 -0700 9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 9.3 @@ -1,10 +0,0 @@ 9.4 -$ \textbf{echo third change >> myfile} 9.5 -$ \textbf{hg commit -m 'third change'} 9.6 -$ \textbf{hg backout --merge -m 'back out second change' 1} 9.7 -reverting myfile 9.8 -created new head 9.9 -changeset backs out changeset 9.10 -merging with changeset 9.11 -merging myfile 9.12 -0 files updated, 1 files merged, 0 files removed, 0 files unresolved 9.13 -(branch merge, don't forget to commit)
10.1 --- a/en/examples/backout.non-tip.cat.out Mon Mar 09 21:13:56 2009 -0700 10.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 10.3 @@ -1,3 +0,0 @@ 10.4 -$ \textbf{cat myfile} 10.5 -first change 10.6 -third change
11.1 --- a/en/examples/backout.non-tip.clone.out Mon Mar 09 21:13:56 2009 -0700 11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 11.3 @@ -1,10 +0,0 @@ 11.4 -$ \textbf{cd ..} 11.5 -$ \textbf{hg clone -r1 myrepo non-tip-repo} 11.6 -requesting all changes 11.7 -adding changesets 11.8 -adding manifests 11.9 -adding file changes 11.10 -added 2 changesets with 2 changes to 1 files 11.11 -updating working directory 11.12 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 11.13 -$ \textbf{cd non-tip-repo}
12.1 --- a/en/examples/backout.simple.log.out Mon Mar 09 21:13:56 2009 -0700 12.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 12.3 @@ -1,10 +0,0 @@ 12.4 -$ \textbf{hg log --style compact} 12.5 -2[tip] 2009-01-30 06:32 +0000 bos 12.6 - back out second change 12.7 - 12.8 -1 2009-01-30 06:32 +0000 bos 12.9 - second change 12.10 - 12.11 -0 2009-01-30 06:32 +0000 bos 12.12 - first change 12.13 -
13.1 --- a/en/examples/backout.simple.out Mon Mar 09 21:13:56 2009 -0700 13.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 13.3 @@ -1,5 +0,0 @@ 13.4 -$ \textbf{hg backout -m 'back out second change' tip} 13.5 -reverting myfile 13.6 -changeset backs out changeset 13.7 -$ \textbf{cat myfile} 13.8 -first change
14.1 --- a/en/examples/bisect.commits.out Mon Mar 09 21:13:56 2009 -0700 14.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 14.3 @@ -1,10 +0,0 @@ 14.4 - 14.5 - 14.6 - 14.7 - 14.8 - 14.9 - 14.10 - 14.11 - 14.12 - 14.13 -
15.1 --- a/en/examples/bisect.help.out Mon Mar 09 21:13:56 2009 -0700 15.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 15.3 @@ -1,33 +0,0 @@ 15.4 - 15.5 - 15.6 - 15.7 - 15.8 - 15.9 - 15.10 - 15.11 - 15.12 - 15.13 - 15.14 - 15.15 - 15.16 - 15.17 - 15.18 - 15.19 - 15.20 - 15.21 - 15.22 - 15.23 - 15.24 - 15.25 - 15.26 - 15.27 - 15.28 - 15.29 - 15.30 - 15.31 - 15.32 - 15.33 - 15.34 - 15.35 - 15.36 -
16.1 --- a/en/examples/bisect.init.out Mon Mar 09 21:13:56 2009 -0700 16.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 16.3 @@ -1,2 +0,0 @@ 16.4 - 16.5 -
17.1 --- a/en/examples/bisect.search.bad-init.out Mon Mar 09 21:13:56 2009 -0700 17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 17.3 @@ -1,2 +0,0 @@ 17.4 - 17.5 -
18.1 --- a/en/examples/bisect.search.good-init.out Mon Mar 09 21:13:56 2009 -0700 18.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 18.3 @@ -1,4 +0,0 @@ 18.4 - 18.5 - 18.6 - 18.7 -
19.1 --- a/en/examples/bisect.search.init.out Mon Mar 09 21:13:56 2009 -0700 19.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 19.3 @@ -1,2 +0,0 @@ 19.4 - 19.5 -
20.1 --- a/en/examples/bisect.search.mytest.out Mon Mar 09 21:13:56 2009 -0700 20.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 20.3 @@ -1,10 +0,0 @@ 20.4 - 20.5 - 20.6 - 20.7 - 20.8 - 20.9 - 20.10 - 20.11 - 20.12 - 20.13 -
21.1 --- a/en/examples/bisect.search.reset.out Mon Mar 09 21:13:56 2009 -0700 21.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 21.3 @@ -1,2 +0,0 @@ 21.4 - 21.5 -
22.1 --- a/en/examples/bisect.search.rest.out Mon Mar 09 21:13:56 2009 -0700 22.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 22.3 @@ -1,19 +0,0 @@ 22.4 - 22.5 - 22.6 - 22.7 - 22.8 - 22.9 - 22.10 - 22.11 - 22.12 - 22.13 - 22.14 - 22.15 - 22.16 - 22.17 - 22.18 - 22.19 - 22.20 - 22.21 - 22.22 -
23.1 --- a/en/examples/bisect.search.step1.out Mon Mar 09 21:13:56 2009 -0700 23.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 23.3 @@ -1,11 +0,0 @@ 23.4 - 23.5 - 23.6 - 23.7 - 23.8 - 23.9 - 23.10 - 23.11 - 23.12 - 23.13 - 23.14 -
24.1 --- a/en/examples/bisect.search.step2.out Mon Mar 09 21:13:56 2009 -0700 24.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 24.3 @@ -1,5 +0,0 @@ 24.4 - 24.5 - 24.6 - 24.7 - 24.8 -
25.1 --- a/en/examples/branch-named.branch.out Mon Mar 09 21:13:56 2009 -0700 25.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 25.3 @@ -1,2 +0,0 @@ 25.4 -$ \textbf{hg branch} 25.5 -default
26.1 --- a/en/examples/branch-named.branches.out Mon Mar 09 21:13:56 2009 -0700 26.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 26.3 @@ -1,9 +0,0 @@ 26.4 -$ \textbf{hg tip} 26.5 -changeset: 26.6 -tag: tip 26.7 -user: Bryan O'Sullivan <bos@serpentine.com> 26.8 - 26.9 -summary: Initial commit 26.10 - 26.11 -$ \textbf{hg branches} 26.12 -default
27.1 --- a/en/examples/branch-named.commit.out Mon Mar 09 21:13:56 2009 -0700 27.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 27.3 @@ -1,10 +0,0 @@ 27.4 -$ \textbf{echo 'hello again' >> myfile} 27.5 -$ \textbf{hg commit -m 'Second commit'} 27.6 -$ \textbf{hg tip} 27.7 -changeset: 27.8 -branch: foo 27.9 -tag: tip 27.10 -user: Bryan O'Sullivan <bos@serpentine.com> 27.11 - 27.12 -summary: Second commit 27.13 -
28.1 --- a/en/examples/branch-named.create.out Mon Mar 09 21:13:56 2009 -0700 28.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 28.3 @@ -1,4 +0,0 @@ 28.4 -$ \textbf{hg branch foo} 28.5 -marked working directory as branch foo 28.6 -$ \textbf{hg branch} 28.7 -foo
29.1 --- a/en/examples/branch-named.foo-commit.out Mon Mar 09 21:13:56 2009 -0700 29.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 29.3 @@ -1,19 +0,0 @@ 29.4 -$ \textbf{echo something > somefile} 29.5 -$ \textbf{hg commit -A -m 'New file'} 29.6 -adding somefile 29.7 -created new head 29.8 -$ \textbf{hg heads} 29.9 -changeset: 29.10 -branch: foo 29.11 -tag: tip 29.12 -parent: 29.13 -user: Bryan O'Sullivan <bos@serpentine.com> 29.14 - 29.15 -summary: New file 29.16 - 29.17 -changeset: 29.18 -branch: bar 29.19 -user: Bryan O'Sullivan <bos@serpentine.com> 29.20 - 29.21 -summary: Third commit 29.22 -
30.1 --- a/en/examples/branch-named.merge.out Mon Mar 09 21:13:56 2009 -0700 30.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 30.3 @@ -1,16 +0,0 @@ 30.4 -$ \textbf{hg branch} 30.5 -bar 30.6 -$ \textbf{hg merge foo} 30.7 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 30.8 -(branch merge, don't forget to commit) 30.9 -$ \textbf{hg commit -m 'Merge'} 30.10 -$ \textbf{hg tip} 30.11 -changeset: 30.12 -branch: bar 30.13 -tag: tip 30.14 -parent: 30.15 -parent: 30.16 -user: Bryan O'Sullivan <bos@serpentine.com> 30.17 - 30.18 -summary: Merge 30.19 -
31.1 --- a/en/examples/branch-named.parents.out Mon Mar 09 21:13:56 2009 -0700 31.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 31.3 @@ -1,12 +0,0 @@ 31.4 -$ \textbf{hg parents} 31.5 -changeset: 31.6 -branch: bar 31.7 -tag: tip 31.8 -user: Bryan O'Sullivan <bos@serpentine.com> 31.9 - 31.10 -summary: Third commit 31.11 - 31.12 -$ \textbf{hg branches} 31.13 -bar 31.14 -foo (inactive) 31.15 -default (inactive)
32.1 --- a/en/examples/branch-named.rebranch.out Mon Mar 09 21:13:56 2009 -0700 32.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 32.3 @@ -1,15 +0,0 @@ 32.4 -$ \textbf{hg branch} 32.5 -foo 32.6 -$ \textbf{hg branch bar} 32.7 -marked working directory as branch bar 32.8 -$ \textbf{echo new file > newfile} 32.9 -$ \textbf{hg commit -A -m 'Third commit'} 32.10 -adding newfile 32.11 -$ \textbf{hg tip} 32.12 -changeset: 32.13 -branch: bar 32.14 -tag: tip 32.15 -user: Bryan O'Sullivan <bos@serpentine.com> 32.16 - 32.17 -summary: Third commit 32.18 -
33.1 --- a/en/examples/branch-named.status.out Mon Mar 09 21:13:56 2009 -0700 33.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 33.3 @@ -1,8 +0,0 @@ 33.4 -$ \textbf{hg status} 33.5 -$ \textbf{hg tip} 33.6 -changeset: 33.7 -tag: tip 33.8 -user: Bryan O'Sullivan <bos@serpentine.com> 33.9 - 33.10 -summary: Initial commit 33.11 -
34.1 --- a/en/examples/branch-named.update-bar.out Mon Mar 09 21:13:56 2009 -0700 34.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 34.3 @@ -1,2 +0,0 @@ 34.4 -$ \textbf{hg update bar} 34.5 -1 files updated, 0 files merged, 1 files removed, 0 files unresolved
35.1 --- a/en/examples/branch-named.update-foo.out Mon Mar 09 21:13:56 2009 -0700 35.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 35.3 @@ -1,13 +0,0 @@ 35.4 -$ \textbf{hg update foo} 35.5 -0 files updated, 0 files merged, 1 files removed, 0 files unresolved 35.6 -$ \textbf{hg update} 35.7 -0 files updated, 0 files merged, 0 files removed, 0 files unresolved 35.8 -$ \textbf{hg parents} 35.9 -changeset: 35.10 -branch: foo 35.11 -user: Bryan O'Sullivan <bos@serpentine.com> 35.12 - 35.13 -summary: Second commit 35.14 - 35.15 -$ \textbf{hg update bar} 35.16 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
36.1 --- a/en/examples/branch-named.update-nothing.out Mon Mar 09 21:13:56 2009 -0700 36.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 36.3 @@ -1,4 +0,0 @@ 36.4 -$ \textbf{hg update foo} 36.5 -0 files updated, 0 files merged, 1 files removed, 0 files unresolved 36.6 -$ \textbf{hg update} 36.7 -0 files updated, 0 files merged, 0 files removed, 0 files unresolved
37.1 --- a/en/examples/branch-named.update-switchy.out Mon Mar 09 21:13:56 2009 -0700 37.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 37.3 @@ -1,19 +0,0 @@ 37.4 -$ \textbf{hg update foo} 37.5 -0 files updated, 0 files merged, 1 files removed, 0 files unresolved 37.6 -$ \textbf{hg parents} 37.7 -changeset: 37.8 -branch: foo 37.9 -user: Bryan O'Sullivan <bos@serpentine.com> 37.10 - 37.11 -summary: Second commit 37.12 - 37.13 -$ \textbf{hg update bar} 37.14 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 37.15 -$ \textbf{hg parents} 37.16 -changeset: 37.17 -branch: bar 37.18 -tag: tip 37.19 -user: Bryan O'Sullivan <bos@serpentine.com> 37.20 - 37.21 -summary: Third commit 37.22 -
38.1 --- a/en/examples/branch-named.update.out Mon Mar 09 21:13:56 2009 -0700 38.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 38.3 @@ -1,13 +0,0 @@ 38.4 -$ \textbf{hg update foo} 38.5 -0 files updated, 0 files merged, 1 files removed, 0 files unresolved 38.6 -$ \textbf{hg update} 38.7 -0 files updated, 0 files merged, 0 files removed, 0 files unresolved 38.8 -$ \textbf{hg parent} 38.9 -changeset: 38.10 -branch: foo 38.11 -user: Bryan O'Sullivan <bos@serpentine.com> 38.12 - 38.13 -summary: Second commit 38.14 - 38.15 -$ \textbf{hg update bar} 38.16 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
39.1 --- a/en/examples/branch-repo.bugfix.out Mon Mar 09 21:13:56 2009 -0700 39.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 39.3 @@ -1,13 +0,0 @@ 39.4 -$ \textbf{hg clone myproject-1.0.1 my-1.0.1-bugfix} 39.5 -updating working directory 39.6 -2 files updated, 0 files merged, 0 files removed, 0 files unresolved 39.7 -$ \textbf{cd my-1.0.1-bugfix} 39.8 -$ \textbf{echo 'I fixed a bug using only echo!' >> myfile} 39.9 -$ \textbf{hg commit -m 'Important fix for 1.0.1'} 39.10 -$ \textbf{hg push} 39.11 -pushing to 39.12 -searching for changes 39.13 -adding changesets 39.14 -adding manifests 39.15 -adding file changes 39.16 -added 1 changesets with 1 changes to 1 files
40.1 --- a/en/examples/branch-repo.clone.out Mon Mar 09 21:13:56 2009 -0700 40.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 40.3 @@ -1,4 +0,0 @@ 40.4 -$ \textbf{cd ..} 40.5 -$ \textbf{hg clone myproject myproject-1.0.1} 40.6 -updating working directory 40.7 -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
41.1 --- a/en/examples/branch-repo.merge.out Mon Mar 09 21:13:56 2009 -0700 41.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 41.3 @@ -1,11 +0,0 @@ 41.4 -$ \textbf{hg merge} 41.5 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 41.6 -(branch merge, don't forget to commit) 41.7 -$ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'} 41.8 -$ \textbf{hg push} 41.9 -pushing to 41.10 -searching for changes 41.11 -adding changesets 41.12 -adding manifests 41.13 -adding file changes 41.14 -added 2 changesets with 1 changes to 1 files
42.1 --- a/en/examples/branch-repo.new.out Mon Mar 09 21:13:56 2009 -0700 42.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 42.3 @@ -1,15 +0,0 @@ 42.4 -$ \textbf{cd ..} 42.5 -$ \textbf{hg clone myproject my-feature} 42.6 -updating working directory 42.7 -2 files updated, 0 files merged, 0 files removed, 0 files unresolved 42.8 -$ \textbf{cd my-feature} 42.9 -$ \textbf{echo 'This sure is an exciting new feature!' > mynewfile} 42.10 -$ \textbf{hg commit -A -m 'New feature'} 42.11 -adding mynewfile 42.12 -$ \textbf{hg push} 42.13 -pushing to 42.14 -searching for changes 42.15 -adding changesets 42.16 -adding manifests 42.17 -adding file changes 42.18 -added 1 changesets with 1 changes to 1 files
43.1 --- a/en/examples/branch-repo.pull.out Mon Mar 09 21:13:56 2009 -0700 43.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 43.3 @@ -1,13 +0,0 @@ 43.4 -$ \textbf{cd ..} 43.5 -$ \textbf{hg clone myproject myproject-merge} 43.6 -updating working directory 43.7 -3 files updated, 0 files merged, 0 files removed, 0 files unresolved 43.8 -$ \textbf{cd myproject-merge} 43.9 -$ \textbf{hg pull ../myproject-1.0.1} 43.10 -pulling from ../myproject-1.0.1 43.11 -searching for changes 43.12 -adding changesets 43.13 -adding manifests 43.14 -adding file changes 43.15 -added 1 changesets with 1 changes to 1 files (+1 heads) 43.16 -(run 'hg heads' to see heads, 'hg merge' to merge)
44.1 --- a/en/examples/branch-repo.tag.out Mon Mar 09 21:13:56 2009 -0700 44.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 44.3 @@ -1,2 +0,0 @@ 44.4 -$ \textbf{cd myproject} 44.5 -$ \textbf{hg tag v1.0}
45.1 --- a/en/examples/branching.clone.out Mon Mar 09 21:13:56 2009 -0700 45.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 45.3 @@ -1,9 +0,0 @@ 45.4 -$ \textbf{cd ..} 45.5 -$ \textbf{hg clone -rv1.0 main stable} 45.6 -requesting all changes 45.7 -adding changesets 45.8 -adding manifests 45.9 -adding file changes 45.10 -added 1 changesets with 1 changes to 1 files 45.11 -updating working directory 45.12 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
46.1 --- a/en/examples/branching.init.out Mon Mar 09 21:13:56 2009 -0700 46.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 46.3 @@ -1,5 +0,0 @@ 46.4 -$ \textbf{hg init main} 46.5 -$ \textbf{cd main} 46.6 -$ \textbf{echo 'This is a boring feature.' > myfile} 46.7 -$ \textbf{hg commit -A -m 'We have reached an important milestone!'} 46.8 -adding myfile
47.1 --- a/en/examples/branching.main.out Mon Mar 09 21:13:56 2009 -0700 47.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 47.3 @@ -1,6 +0,0 @@ 47.4 -$ \textbf{cd ../main} 47.5 -$ \textbf{echo 'This is exciting and new!' >> myfile} 47.6 -$ \textbf{hg commit -m 'Add a new feature'} 47.7 -$ \textbf{cat myfile} 47.8 -This is a boring feature. 47.9 -This is exciting and new!
48.1 --- a/en/examples/branching.merge.out Mon Mar 09 21:13:56 2009 -0700 48.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 48.3 @@ -1,17 +0,0 @@ 48.4 -$ \textbf{cd ../main} 48.5 -$ \textbf{hg pull ../stable} 48.6 -pulling from ../stable 48.7 -searching for changes 48.8 -adding changesets 48.9 -adding manifests 48.10 -adding file changes 48.11 -added 1 changesets with 1 changes to 1 files (+1 heads) 48.12 -(run 'hg heads' to see heads, 'hg merge' to merge) 48.13 -$ \textbf{hg merge} 48.14 -merging myfile 48.15 -0 files updated, 1 files merged, 0 files removed, 0 files unresolved 48.16 -(branch merge, don't forget to commit) 48.17 -$ \textbf{hg commit -m 'Bring in bugfix from stable branch'} 48.18 -$ \textbf{cat myfile} 48.19 -This is a fix to a boring feature. 48.20 -This is exciting and new!
49.1 --- a/en/examples/branching.stable.out Mon Mar 09 21:13:56 2009 -0700 49.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 49.3 @@ -1,13 +0,0 @@ 49.4 -$ \textbf{hg clone stable stable-fix} 49.5 -updating working directory 49.6 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 49.7 -$ \textbf{cd stable-fix} 49.8 -$ \textbf{echo 'This is a fix to a boring feature.' > myfile} 49.9 -$ \textbf{hg commit -m 'Fix a bug'} 49.10 -$ \textbf{hg push} 49.11 -pushing to 49.12 -searching for changes 49.13 -adding changesets 49.14 -adding manifests 49.15 -adding file changes 49.16 -added 1 changesets with 1 changes to 1 files
50.1 --- a/en/examples/branching.tag.out Mon Mar 09 21:13:56 2009 -0700 50.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 50.3 @@ -1,11 +0,0 @@ 50.4 -$ \textbf{hg tag v1.0} 50.5 -$ \textbf{hg tip} 50.6 -changeset: 50.7 -tag: tip 50.8 -user: Bryan O'Sullivan <bos@serpentine.com> 50.9 - 50.10 -summary: Added tag v1.0 for changeset 50.11 - 50.12 -$ \textbf{hg tags} 50.13 -tip 50.14 -v1.0
51.1 --- a/en/examples/branching.update.out Mon Mar 09 21:13:56 2009 -0700 51.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 51.3 @@ -1,7 +0,0 @@ 51.4 -$ \textbf{cd ..} 51.5 -$ \textbf{hg clone -U main main-old} 51.6 -$ \textbf{cd main-old} 51.7 -$ \textbf{hg update v1.0} 51.8 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 51.9 -$ \textbf{cat myfile} 51.10 -This is a boring feature.
52.1 --- a/en/examples/cmdref.diff-p.out Mon Mar 09 21:13:56 2009 -0700 52.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 52.3 @@ -1,22 +0,0 @@ 52.4 -$ \textbf{echo '[diff]' >> $HGRC} 52.5 -$ \textbf{echo 'showfunc = False' >> $HGRC} 52.6 -$ \textbf{hg diff} 52.7 -diff -r myfile.c 52.8 - 52.9 - 52.10 -@@ -1,4 +1,4 @@ 52.11 - int myfunc() 52.12 - \{ 52.13 -- return 1; 52.14 -+ return 10; 52.15 - \} 52.16 -$ \textbf{hg diff -p} 52.17 -diff -r myfile.c 52.18 - 52.19 - 52.20 -@@ -1,4 +1,4 @@ 52.21 - int myfunc() 52.22 - \{ 52.23 -- return 1; 52.24 -+ return 10; 52.25 - \}
53.1 --- a/en/examples/daily.copy.after.out Mon Mar 09 21:13:56 2009 -0700 53.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 53.3 @@ -1,2 +0,0 @@ 53.4 -$ \textbf{cp a z} 53.5 -$ \textbf{hg copy --after a z}
54.1 --- a/en/examples/daily.copy.cat.out Mon Mar 09 21:13:56 2009 -0700 54.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 54.3 @@ -1,5 +0,0 @@ 54.4 -$ \textbf{cat file} 54.5 -line 54.6 -new contents 54.7 -$ \textbf{cat ../my-copy/new-file} 54.8 -line
55.1 --- a/en/examples/daily.copy.clone.out Mon Mar 09 21:13:56 2009 -0700 55.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 55.3 @@ -1,4 +0,0 @@ 55.4 -$ \textbf{cd ..} 55.5 -$ \textbf{hg clone my-copy your-copy} 55.6 -updating working directory 55.7 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
56.1 --- a/en/examples/daily.copy.copy.out Mon Mar 09 21:13:56 2009 -0700 56.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 56.3 @@ -1,2 +0,0 @@ 56.4 -$ \textbf{cd my-copy} 56.5 -$ \textbf{hg copy file new-file}
57.1 --- a/en/examples/daily.copy.dir-dest.out Mon Mar 09 21:13:56 2009 -0700 57.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 57.3 @@ -1,4 +0,0 @@ 57.4 -$ \textbf{mkdir d} 57.5 -$ \textbf{hg copy a b d} 57.6 -$ \textbf{ls d} 57.7 -a b
58.1 --- a/en/examples/daily.copy.dir-src-dest.out Mon Mar 09 21:13:56 2009 -0700 58.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 58.3 @@ -1,2 +0,0 @@ 58.4 -$ \textbf{hg copy c d} 58.5 -copying c/a/c to d/c/a/c
59.1 --- a/en/examples/daily.copy.dir-src.out Mon Mar 09 21:13:56 2009 -0700 59.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 59.3 @@ -1,2 +0,0 @@ 59.4 -$ \textbf{hg copy c e} 59.5 -copying c/a/c to e/a/c
60.1 --- a/en/examples/daily.copy.init.out Mon Mar 09 21:13:56 2009 -0700 60.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 60.3 @@ -1,5 +0,0 @@ 60.4 -$ \textbf{hg init my-copy} 60.5 -$ \textbf{cd my-copy} 60.6 -$ \textbf{echo line > file} 60.7 -$ \textbf{hg add file} 60.8 -$ \textbf{hg commit -m 'Added a file'}
61.1 --- a/en/examples/daily.copy.merge.out Mon Mar 09 21:13:56 2009 -0700 61.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 61.3 @@ -1,15 +0,0 @@ 61.4 -$ \textbf{hg pull ../my-copy} 61.5 -pulling from ../my-copy 61.6 -searching for changes 61.7 -adding changesets 61.8 -adding manifests 61.9 -adding file changes 61.10 -added 1 changesets with 1 changes to 1 files (+1 heads) 61.11 -(run 'hg heads' to see heads, 'hg merge' to merge) 61.12 -$ \textbf{hg merge} 61.13 -merging file and new-file to new-file 61.14 -0 files updated, 1 files merged, 0 files removed, 0 files unresolved 61.15 -(branch merge, don't forget to commit) 61.16 -$ \textbf{cat new-file} 61.17 -line 61.18 -new contents
62.1 --- a/en/examples/daily.copy.other.out Mon Mar 09 21:13:56 2009 -0700 62.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 62.3 @@ -1,3 +0,0 @@ 62.4 -$ \textbf{cd ../your-copy} 62.5 -$ \textbf{echo 'new contents' >> file} 62.6 -$ \textbf{hg commit -m 'Changed file'}
63.1 --- a/en/examples/daily.copy.simple.out Mon Mar 09 21:13:56 2009 -0700 63.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 63.3 @@ -1,4 +0,0 @@ 63.4 -$ \textbf{mkdir k} 63.5 -$ \textbf{hg copy a k} 63.6 -$ \textbf{ls k} 63.7 -a
64.1 --- a/en/examples/daily.copy.status-copy.out Mon Mar 09 21:13:56 2009 -0700 64.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 64.3 @@ -1,4 +0,0 @@ 64.4 -$ \textbf{hg status -C} 64.5 -A new-file 64.6 - file 64.7 -$ \textbf{hg commit -m 'Copied file'}
65.1 --- a/en/examples/daily.copy.status.out Mon Mar 09 21:13:56 2009 -0700 65.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 65.3 @@ -1,2 +0,0 @@ 65.4 -$ \textbf{hg status} 65.5 -A new-file
66.1 --- a/en/examples/daily.files.add-dir.out Mon Mar 09 21:13:56 2009 -0700 66.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 66.3 @@ -1,10 +0,0 @@ 66.4 -$ \textbf{mkdir b} 66.5 -$ \textbf{echo b > b/b} 66.6 -$ \textbf{echo c > b/c} 66.7 -$ \textbf{mkdir b/d} 66.8 -$ \textbf{echo d > b/d/d} 66.9 -$ \textbf{hg add b} 66.10 -adding b/b 66.11 -adding b/c 66.12 -adding b/d/d 66.13 -$ \textbf{hg commit -m 'Added all files in subdirectory'}
67.1 --- a/en/examples/daily.files.add.out Mon Mar 09 21:13:56 2009 -0700 67.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 67.3 @@ -1,10 +0,0 @@ 67.4 -$ \textbf{hg init add-example} 67.5 -$ \textbf{cd add-example} 67.6 -$ \textbf{echo a > a} 67.7 -$ \textbf{hg status} 67.8 -? a 67.9 -$ \textbf{hg add a} 67.10 -$ \textbf{hg status} 67.11 -A a 67.12 -$ \textbf{hg commit -m 'Added one file'} 67.13 -$ \textbf{hg status}
68.1 --- a/en/examples/daily.files.addremove.out Mon Mar 09 21:13:56 2009 -0700 68.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 68.3 @@ -1,7 +0,0 @@ 68.4 -$ \textbf{hg init addremove-example} 68.5 -$ \textbf{cd addremove-example} 68.6 -$ \textbf{echo a > a} 68.7 -$ \textbf{echo b > b} 68.8 -$ \textbf{hg addremove} 68.9 -adding a 68.10 -adding b
69.1 --- a/en/examples/daily.files.commit-addremove.out Mon Mar 09 21:13:56 2009 -0700 69.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 69.3 @@ -1,3 +0,0 @@ 69.4 -$ \textbf{echo c > c} 69.5 -$ \textbf{hg commit -A -m 'Commit with addremove'} 69.6 -adding c
70.1 --- a/en/examples/daily.files.hidden.out Mon Mar 09 21:13:56 2009 -0700 70.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 70.3 @@ -1,14 +0,0 @@ 70.4 -$ \textbf{hg init hidden-example} 70.5 -$ \textbf{cd hidden-example} 70.6 -$ \textbf{mkdir empty} 70.7 -$ \textbf{touch empty/.hidden} 70.8 -$ \textbf{hg add empty/.hidden} 70.9 -$ \textbf{hg commit -m 'Manage an empty-looking directory'} 70.10 -$ \textbf{ls empty} 70.11 -$ \textbf{cd ..} 70.12 -$ \textbf{hg clone hidden-example tmp} 70.13 -updating working directory 70.14 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 70.15 -$ \textbf{ls tmp} 70.16 -empty 70.17 -$ \textbf{ls tmp/empty}
71.1 --- a/en/examples/daily.files.missing.out Mon Mar 09 21:13:56 2009 -0700 71.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 71.3 @@ -1,8 +0,0 @@ 71.4 -$ \textbf{hg init missing-example} 71.5 -$ \textbf{cd missing-example} 71.6 -$ \textbf{echo a > a} 71.7 -$ \textbf{hg add a} 71.8 -$ \textbf{hg commit -m 'File about to be missing'} 71.9 -$ \textbf{rm a} 71.10 -$ \textbf{hg status} 71.11 -! a
72.1 --- a/en/examples/daily.files.recover-missing.out Mon Mar 09 21:13:56 2009 -0700 72.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 72.3 @@ -1,4 +0,0 @@ 72.4 -$ \textbf{hg revert a} 72.5 -$ \textbf{cat a} 72.6 -a 72.7 -$ \textbf{hg status}
73.1 --- a/en/examples/daily.files.remove-after.out Mon Mar 09 21:13:56 2009 -0700 73.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 73.3 @@ -1,3 +0,0 @@ 73.4 -$ \textbf{hg remove --after a} 73.5 -$ \textbf{hg status} 73.6 -R a
74.1 --- a/en/examples/daily.files.remove.out Mon Mar 09 21:13:56 2009 -0700 74.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 74.3 @@ -1,13 +0,0 @@ 74.4 -$ \textbf{hg init remove-example} 74.5 -$ \textbf{cd remove-example} 74.6 -$ \textbf{echo a > a} 74.7 -$ \textbf{mkdir b} 74.8 -$ \textbf{echo b > b/b} 74.9 -$ \textbf{hg add a b} 74.10 -adding b/b 74.11 -$ \textbf{hg commit -m 'Small example for file removal'} 74.12 -$ \textbf{hg remove a} 74.13 -$ \textbf{hg status} 74.14 -R a 74.15 -$ \textbf{hg remove b} 74.16 -removing b/b
75.1 --- a/en/examples/daily.rename.rename.out Mon Mar 09 21:13:56 2009 -0700 75.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 75.3 @@ -1,1 +0,0 @@ 75.4 -$ \textbf{hg rename a b}
76.1 --- a/en/examples/daily.rename.status-copy.out Mon Mar 09 21:13:56 2009 -0700 76.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 76.3 @@ -1,4 +0,0 @@ 76.4 -$ \textbf{hg status -C} 76.5 -A b 76.6 - a 76.7 -R a
77.1 --- a/en/examples/daily.rename.status.out Mon Mar 09 21:13:56 2009 -0700 77.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 77.3 @@ -1,3 +0,0 @@ 77.4 -$ \textbf{hg status} 77.5 -A b 77.6 -R a
78.1 --- a/en/examples/daily.revert.add.out Mon Mar 09 21:13:56 2009 -0700 78.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 78.3 @@ -1,7 +0,0 @@ 78.4 -$ \textbf{echo oops > oops} 78.5 -$ \textbf{hg add oops} 78.6 -$ \textbf{hg status oops} 78.7 -A oops 78.8 -$ \textbf{hg revert oops} 78.9 -$ \textbf{hg status} 78.10 -? oops
79.1 --- a/en/examples/daily.revert.copy.out Mon Mar 09 21:13:56 2009 -0700 79.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 79.3 @@ -1,4 +0,0 @@ 79.4 -$ \textbf{hg copy file new-file} 79.5 -$ \textbf{hg revert new-file} 79.6 -$ \textbf{hg status} 79.7 -? new-file
80.1 --- a/en/examples/daily.revert.missing.out Mon Mar 09 21:13:56 2009 -0700 80.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 80.3 @@ -1,6 +0,0 @@ 80.4 -$ \textbf{rm file} 80.5 -$ \textbf{hg status} 80.6 -! file 80.7 -$ \textbf{hg revert file} 80.8 -$ \textbf{ls file} 80.9 -file
81.1 --- a/en/examples/daily.revert.modify.out Mon Mar 09 21:13:56 2009 -0700 81.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 81.3 @@ -1,10 +0,0 @@ 81.4 -$ \textbf{cat file} 81.5 -original content 81.6 -$ \textbf{echo unwanted change >> file} 81.7 -$ \textbf{hg diff file} 81.8 -diff -r file 81.9 - 81.10 - 81.11 -@@ -1,1 +1,2 @@ 81.12 - original content 81.13 -+unwanted change
82.1 --- a/en/examples/daily.revert.remove.out Mon Mar 09 21:13:56 2009 -0700 82.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 82.3 @@ -1,7 +0,0 @@ 82.4 -$ \textbf{hg remove file} 82.5 -$ \textbf{hg status} 82.6 -R file 82.7 -$ \textbf{hg revert file} 82.8 -$ \textbf{hg status} 82.9 -$ \textbf{ls file} 82.10 -file
83.1 --- a/en/examples/daily.revert.rename-orig.out Mon Mar 09 21:13:56 2009 -0700 83.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 83.3 @@ -1,4 +0,0 @@ 83.4 -$ \textbf{hg revert file} 83.5 -no changes needed to file 83.6 -$ \textbf{hg status} 83.7 -? new-file
84.1 --- a/en/examples/daily.revert.rename.out Mon Mar 09 21:13:56 2009 -0700 84.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 84.3 @@ -1,4 +0,0 @@ 84.4 -$ \textbf{hg rename file new-file} 84.5 -$ \textbf{hg revert new-file} 84.6 -$ \textbf{hg status} 84.7 -? new-file
85.1 --- a/en/examples/daily.revert.status.out Mon Mar 09 21:13:56 2009 -0700 85.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 85.3 @@ -1,5 +0,0 @@ 85.4 -$ \textbf{hg status} 85.5 -? file.orig 85.6 -$ \textbf{cat file.orig} 85.7 -original content 85.8 -unwanted change
86.1 --- a/en/examples/daily.revert.unmodify.out Mon Mar 09 21:13:56 2009 -0700 86.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 86.3 @@ -1,5 +0,0 @@ 86.4 -$ \textbf{hg status} 86.5 -M file 86.6 -$ \textbf{hg revert file} 86.7 -$ \textbf{cat file} 86.8 -original content
87.1 --- a/en/examples/extdiff.diff.out Mon Mar 09 21:13:56 2009 -0700 87.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 87.3 @@ -1,7 +0,0 @@ 87.4 -$ \textbf{hg diff} 87.5 -diff -r myfile 87.6 - 87.7 - 87.8 -@@ -1,1 +1,2 @@ 87.9 - The first line. 87.10 -+The second line.
88.1 --- a/en/examples/extdiff.extdiff-ctx.out Mon Mar 09 21:13:56 2009 -0700 88.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 88.3 @@ -1,8 +0,0 @@ 88.4 -$ \textbf{hg extdiff -o -NprcC5} 88.5 - 88.6 - 88.7 -*************** 88.8 -*** 1 **** 88.9 - 88.10 - The first line. 88.11 -+ The second line.
89.1 --- a/en/examples/extdiff.extdiff.out Mon Mar 09 21:13:56 2009 -0700 89.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 89.3 @@ -1,6 +0,0 @@ 89.4 -$ \textbf{hg extdiff} 89.5 - 89.6 - 89.7 -@@ -1 +1,2 @@ 89.8 - The first line. 89.9 -+The second line.
90.1 --- a/en/examples/filenames.dirs.out Mon Mar 09 21:13:56 2009 -0700 90.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 90.3 @@ -1,5 +0,0 @@ 90.4 -$ \textbf{hg status src} 90.5 -? src/main.py 90.6 -? src/watcher/_watcher.c 90.7 -? src/watcher/watcher.py 90.8 -? src/xyzzy.txt
91.1 --- a/en/examples/filenames.files.out Mon Mar 09 21:13:56 2009 -0700 91.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 91.3 @@ -1,1 +0,0 @@ 91.4 -$ \textbf{hg add COPYING README examples/simple.py}
92.1 --- a/en/examples/filenames.filter.exclude.out Mon Mar 09 21:13:56 2009 -0700 92.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 92.3 @@ -1,3 +0,0 @@ 92.4 -$ \textbf{hg status -X '**.py' src} 92.5 -? src/watcher/_watcher.c 92.6 -? src/xyzzy.txt
93.1 --- a/en/examples/filenames.filter.include.out Mon Mar 09 21:13:56 2009 -0700 93.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 93.3 @@ -1,2 +0,0 @@ 93.4 -$ \textbf{hg status -I '*.in'} 93.5 -? MANIFEST.in
94.1 --- a/en/examples/filenames.glob.group.out Mon Mar 09 21:13:56 2009 -0700 94.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 94.3 @@ -1,3 +0,0 @@ 94.4 -$ \textbf{hg status 'glob:*.\{in,py\}'} 94.5 -? MANIFEST.in 94.6 -? setup.py
95.1 --- a/en/examples/filenames.glob.question.out Mon Mar 09 21:13:56 2009 -0700 95.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 95.3 @@ -1,2 +0,0 @@ 95.4 -$ \textbf{hg status 'glob:**.?'} 95.5 -? src/watcher/_watcher.c
96.1 --- a/en/examples/filenames.glob.range.out Mon Mar 09 21:13:56 2009 -0700 96.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 96.3 @@ -1,3 +0,0 @@ 96.4 -$ \textbf{hg status 'glob:**[nr-t]'} 96.5 -? MANIFEST.in 96.6 -? src/xyzzy.txt
97.1 --- a/en/examples/filenames.glob.star-starstar.out Mon Mar 09 21:13:56 2009 -0700 97.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 97.3 @@ -1,8 +0,0 @@ 97.4 -$ \textbf{hg status 'glob:*.py'} 97.5 -? setup.py 97.6 -$ \textbf{hg status 'glob:**.py'} 97.7 -A examples/simple.py 97.8 -A src/main.py 97.9 -? examples/performant.py 97.10 -? setup.py 97.11 -? src/watcher/watcher.py
98.1 --- a/en/examples/filenames.glob.star.out Mon Mar 09 21:13:56 2009 -0700 98.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 98.3 @@ -1,2 +0,0 @@ 98.4 -$ \textbf{hg add 'glob:*.py'} 98.5 -adding main.py
99.1 --- a/en/examples/filenames.glob.starstar.out Mon Mar 09 21:13:56 2009 -0700 99.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 99.3 @@ -1,7 +0,0 @@ 99.4 -$ \textbf{cd ..} 99.5 -$ \textbf{hg status 'glob:**.py'} 99.6 -A examples/simple.py 99.7 -A src/main.py 99.8 -? examples/performant.py 99.9 -? setup.py 99.10 -? src/watcher/watcher.py
100.1 --- a/en/examples/filenames.wdir-relname.out Mon Mar 09 21:13:56 2009 -0700 100.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 100.3 @@ -1,22 +0,0 @@ 100.4 -$ \textbf{hg status} 100.5 -A COPYING 100.6 -A README 100.7 -A examples/simple.py 100.8 -? MANIFEST.in 100.9 -? examples/performant.py 100.10 -? setup.py 100.11 -? src/main.py 100.12 -? src/watcher/_watcher.c 100.13 -? src/watcher/watcher.py 100.14 -? src/xyzzy.txt 100.15 -$ \textbf{hg status `hg root`} 100.16 -A ../COPYING 100.17 -A ../README 100.18 -A ../examples/simple.py 100.19 -? ../MANIFEST.in 100.20 -? ../examples/performant.py 100.21 -? ../setup.py 100.22 -? main.py 100.23 -? watcher/_watcher.c 100.24 -? watcher/watcher.py 100.25 -? xyzzy.txt
101.1 --- a/en/examples/filenames.wdir-subdir.out Mon Mar 09 21:13:56 2009 -0700 101.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 101.3 @@ -1,14 +0,0 @@ 101.4 -$ \textbf{cd src} 101.5 -$ \textbf{hg add -n} 101.6 -adding ../MANIFEST.in 101.7 -adding ../examples/performant.py 101.8 -adding ../setup.py 101.9 -adding main.py 101.10 -adding watcher/_watcher.c 101.11 -adding watcher/watcher.py 101.12 -adding xyzzy.txt 101.13 -$ \textbf{hg add -n .} 101.14 -adding main.py 101.15 -adding watcher/_watcher.c 101.16 -adding watcher/watcher.py 101.17 -adding xyzzy.txt
102.1 --- a/en/examples/hook.msglen.go.out Mon Mar 09 21:13:56 2009 -0700 102.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 102.3 @@ -1,10 +0,0 @@ 102.4 -$ \textbf{cat .hg/hgrc} 102.5 -[hooks] 102.6 -pretxncommit.msglen = test `hg tip --template \{desc\} | wc -c` -ge 10 102.7 -$ \textbf{echo a > a} 102.8 -$ \textbf{hg add a} 102.9 -$ \textbf{hg commit -A -m 'too short'} 102.10 -transaction abort! 102.11 -rollback completed 102.12 -abort: pretxncommit.msglen hook exited with status 1 102.13 -$ \textbf{hg commit -A -m 'long enough'}
103.1 --- a/en/examples/hook.msglen.run.out Mon Mar 09 21:13:56 2009 -0700 103.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 103.3 @@ -1,10 +0,0 @@ 103.4 -$ \textbf{cat .hg/hgrc} 103.5 -[hooks] 103.6 -pretxncommit.msglen = test `hg tip --template \{desc\} | wc -c` -ge 10 103.7 -$ \textbf{echo a > a} 103.8 -$ \textbf{hg add a} 103.9 -$ \textbf{hg commit -A -m 'too short'} 103.10 -abort: pretxncommit.msglen hook exited with status 1 103.11 -transaction abort! 103.12 -rollback completed 103.13 -$ \textbf{hg commit -A -m 'long enough'}
104.1 --- a/en/examples/hook.simple.ext.out Mon Mar 09 21:13:56 2009 -0700 104.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 104.3 @@ -1,5 +0,0 @@ 104.4 -$ \textbf{echo 'commit.when = echo -n "date of commit: "; date' >> .hg/hgrc} 104.5 -$ \textbf{echo a >> a} 104.6 -$ \textbf{hg commit -m 'i have two hooks'} 104.7 -committed 104.8 -
105.1 --- a/en/examples/hook.simple.init.out Mon Mar 09 21:13:56 2009 -0700 105.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 105.3 @@ -1,11 +0,0 @@ 105.4 -$ \textbf{hg init hook-test} 105.5 -$ \textbf{cd hook-test} 105.6 -$ \textbf{echo '[hooks]' >> .hg/hgrc} 105.7 -$ \textbf{echo 'commit = echo committed $HG_NODE' >> .hg/hgrc} 105.8 -$ \textbf{cat .hg/hgrc} 105.9 -[hooks] 105.10 -commit = echo committed $HG_NODE 105.11 -$ \textbf{echo a > a} 105.12 -$ \textbf{hg add a} 105.13 -$ \textbf{hg commit -m 'testing commit hook'} 105.14 -committed
106.1 --- a/en/examples/hook.simple.pretxncommit.out Mon Mar 09 21:13:56 2009 -0700 106.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 106.3 @@ -1,13 +0,0 @@ 106.4 -$ \textbf{cat check_bug_id} 106.5 -#!/bin/sh 106.6 -# check that a commit comment mentions a numeric bug id 106.7 -hg log -r $1 --template \{desc\} | grep -q "\textbackslash{}<bug *[0-9]" 106.8 -$ \textbf{echo 'pretxncommit.bug_id_required = ./check_bug_id $HG_NODE' >> .hg/hgrc} 106.9 -$ \textbf{echo a >> a} 106.10 -$ \textbf{hg commit -m 'i am not mentioning a bug id'} 106.11 -transaction abort! 106.12 -rollback completed 106.13 -abort: pretxncommit.bug_id_required hook exited with status 1 106.14 -$ \textbf{hg commit -m 'i refer you to bug 666'} 106.15 -committed 106.16 -
107.1 --- a/en/examples/hook.ws.better.out Mon Mar 09 21:13:56 2009 -0700 107.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 107.3 @@ -1,17 +0,0 @@ 107.4 -$ \textbf{cat .hg/hgrc} 107.5 -[hooks] 107.6 -pretxncommit.whitespace = .hg/check_whitespace.py 107.7 -$ \textbf{echo 'a ' >> a} 107.8 -$ \textbf{hg commit -A -m 'add new line with trailing whitespace'} 107.9 -a, line 2: trailing whitespace added 107.10 -commit message saved to .hg/commit.save 107.11 -transaction abort! 107.12 -rollback completed 107.13 -abort: pretxncommit.whitespace hook exited with status 1 107.14 -$ \textbf{sed -i 's, *$,,' a} 107.15 -$ \textbf{hg commit -A -m 'trimmed trailing whitespace'} 107.16 -a, line 2: trailing whitespace added 107.17 -commit message saved to .hg/commit.save 107.18 -transaction abort! 107.19 -rollback completed 107.20 -abort: pretxncommit.whitespace hook exited with status 1
108.1 --- a/en/examples/hook.ws.simple.out Mon Mar 09 21:13:56 2009 -0700 108.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 108.3 @@ -1,11 +0,0 @@ 108.4 -$ \textbf{cat .hg/hgrc} 108.5 -[hooks] 108.6 -pretxncommit.whitespace = hg export tip | (! egrep -q '^\textbackslash{}+.*[ \textbackslash{}t]$') 108.7 -$ \textbf{echo 'a ' > a} 108.8 -$ \textbf{hg commit -A -m 'test with trailing whitespace'} 108.9 -adding a 108.10 -transaction abort! 108.11 -rollback completed 108.12 -abort: pretxncommit.whitespace hook exited with status 1 108.13 -$ \textbf{echo 'a' > a} 108.14 -$ \textbf{hg commit -A -m 'drop trailing whitespace and try again'}
109.1 --- a/en/examples/issue29.go.out Mon Mar 09 21:13:56 2009 -0700 109.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 109.3 @@ -1,17 +0,0 @@ 109.4 -$ \textbf{hg init issue29} 109.5 -$ \textbf{cd issue29} 109.6 -$ \textbf{echo a > a} 109.7 -$ \textbf{hg ci -Ama} 109.8 -adding a 109.9 -$ \textbf{echo b > b} 109.10 -$ \textbf{hg ci -Amb} 109.11 -adding b 109.12 -$ \textbf{hg up 0} 109.13 -0 files updated, 0 files merged, 1 files removed, 0 files unresolved 109.14 -$ \textbf{mkdir b} 109.15 -$ \textbf{echo b > b/b} 109.16 -$ \textbf{hg ci -Amc} 109.17 -adding b/b 109.18 -created new head 109.19 -$ \textbf{hg merge} 109.20 -
110.1 --- a/en/examples/mq.dodiff.diff.out Mon Mar 09 21:13:56 2009 -0700 110.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 110.3 @@ -1,13 +0,0 @@ 110.4 -$ \textbf{echo 'this is my original thought' > oldfile} 110.5 -$ \textbf{echo 'i have changed my mind' > newfile} 110.6 -$ \textbf{diff -u oldfile newfile > tiny.patch} 110.7 -$ \textbf{cat tiny.patch} 110.8 - 110.9 - 110.10 -@@ -1 +1 @@ 110.11 --this is my original thought 110.12 -+i have changed my mind 110.13 -$ \textbf{patch < tiny.patch} 110.14 -patching file oldfile 110.15 -$ \textbf{cat oldfile} 110.16 -i have changed my mind
111.1 --- a/en/examples/mq.guards.init.out Mon Mar 09 21:13:56 2009 -0700 111.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 111.3 @@ -1,9 +0,0 @@ 111.4 -$ \textbf{hg qinit} 111.5 -$ \textbf{hg qnew hello.patch} 111.6 -$ \textbf{echo hello > hello} 111.7 -$ \textbf{hg add hello} 111.8 -$ \textbf{hg qrefresh} 111.9 -$ \textbf{hg qnew goodbye.patch} 111.10 -$ \textbf{echo goodbye > goodbye} 111.11 -$ \textbf{hg add goodbye} 111.12 -$ \textbf{hg qrefresh}
112.1 --- a/en/examples/mq.guards.qguard.neg.out Mon Mar 09 21:13:56 2009 -0700 112.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 112.3 @@ -1,3 +0,0 @@ 112.4 -$ \textbf{hg qguard hello.patch -quux} 112.5 -$ \textbf{hg qguard hello.patch} 112.6 -hello.patch: -quux
113.1 --- a/en/examples/mq.guards.qguard.out Mon Mar 09 21:13:56 2009 -0700 113.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 113.3 @@ -1,2 +0,0 @@ 113.4 -$ \textbf{hg qguard} 113.5 -goodbye.patch: unguarded
114.1 --- a/en/examples/mq.guards.qguard.pos.out Mon Mar 09 21:13:56 2009 -0700 114.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 114.3 @@ -1,3 +0,0 @@ 114.4 -$ \textbf{hg qguard +foo} 114.5 -$ \textbf{hg qguard} 114.6 -goodbye.patch: +foo
115.1 --- a/en/examples/mq.guards.qselect.cat.out Mon Mar 09 21:13:56 2009 -0700 115.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 115.3 @@ -1,2 +0,0 @@ 115.4 -$ \textbf{cat .hg/patches/guards} 115.5 -foo
116.1 --- a/en/examples/mq.guards.qselect.error.out Mon Mar 09 21:13:56 2009 -0700 116.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 116.3 @@ -1,2 +0,0 @@ 116.4 -$ \textbf{hg qselect +foo} 116.5 -abort: guard '+foo' starts with invalid character: '+'
117.1 --- a/en/examples/mq.guards.qselect.foo.out Mon Mar 09 21:13:56 2009 -0700 117.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 117.3 @@ -1,8 +0,0 @@ 117.4 -$ \textbf{hg qpop -a} 117.5 -patch queue now empty 117.6 -$ \textbf{hg qselect} 117.7 -no active guards 117.8 -$ \textbf{hg qselect foo} 117.9 -number of unguarded, unapplied patches has changed from 1 to 2 117.10 -$ \textbf{hg qselect} 117.11 -foo
118.1 --- a/en/examples/mq.guards.qselect.foobar.out Mon Mar 09 21:13:56 2009 -0700 118.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 118.3 @@ -1,8 +0,0 @@ 118.4 -$ \textbf{hg qselect foo bar} 118.5 -number of unguarded, unapplied patches has changed from 0 to 2 118.6 -$ \textbf{hg qpop -a} 118.7 -no patches applied 118.8 -$ \textbf{hg qpush -a} 118.9 -applying hello.patch 118.10 -applying goodbye.patch 118.11 -now at: goodbye.patch
119.1 --- a/en/examples/mq.guards.qselect.qpush.out Mon Mar 09 21:13:56 2009 -0700 119.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 119.3 @@ -1,4 +0,0 @@ 119.4 -$ \textbf{hg qpush -a} 119.5 -applying hello.patch 119.6 -applying goodbye.patch 119.7 -now at: goodbye.patch
120.1 --- a/en/examples/mq.guards.qselect.quux.out Mon Mar 09 21:13:56 2009 -0700 120.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 120.3 @@ -1,6 +0,0 @@ 120.4 -$ \textbf{hg qselect quux} 120.5 -number of guarded, applied patches has changed from 0 to 2 120.6 -$ \textbf{hg qpop -a} 120.7 -patch queue now empty 120.8 -$ \textbf{hg qpush -a} 120.9 -patch series already fully applied
121.1 --- a/en/examples/mq.guards.series.out Mon Mar 09 21:13:56 2009 -0700 121.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 121.3 @@ -1,3 +0,0 @@ 121.4 -$ \textbf{cat .hg/patches/series} 121.5 -hello.patch #-quux 121.6 -goodbye.patch #+foo
122.1 --- a/en/examples/mq.id.out.out Mon Mar 09 21:13:56 2009 -0700 122.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 122.3 @@ -1,32 +0,0 @@ 122.4 -$ \textbf{hg qapplied} 122.5 -first.patch 122.6 -second.patch 122.7 -$ \textbf{hg log -r qbase:qtip} 122.8 -changeset: 122.9 -tag: first.patch 122.10 -tag: qbase 122.11 -user: Bryan O'Sullivan <bos@serpentine.com> 122.12 - 122.13 -summary: patch queue: first.patch 122.14 - 122.15 -changeset: 122.16 -tag: second.patch 122.17 -tag: qtip 122.18 -tag: tip 122.19 -user: Bryan O'Sullivan <bos@serpentine.com> 122.20 - 122.21 -summary: patch queue: second.patch 122.22 - 122.23 -$ \textbf{hg export second.patch} 122.24 -# HG changeset patch 122.25 -# User Bryan O'Sullivan <bos@serpentine.com> 122.26 - 122.27 -# Node ID 122.28 -# Parent 122.29 -patch queue: second.patch 122.30 - 122.31 -diff -r -r other.c 122.32 - 122.33 - 122.34 -@@ -0,0 +1,1 @@ 122.35 -+double u;
123.1 --- a/en/examples/mq.id.output.out Mon Mar 09 21:13:56 2009 -0700 123.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 123.3 @@ -1,32 +0,0 @@ 123.4 -$ \textbf{hg qapplied} 123.5 -first.patch 123.6 -second.patch 123.7 -$ \textbf{hg log -r qbase:qtip} 123.8 -changeset: 123.9 -tag: first.patch 123.10 -tag: qbase 123.11 -user: Bryan O'Sullivan <bos@serpentine.com> 123.12 - 123.13 -summary: [mq]: first.patch 123.14 - 123.15 -changeset: 123.16 -tag: qtip 123.17 -tag: second.patch 123.18 -tag: tip 123.19 -user: Bryan O'Sullivan <bos@serpentine.com> 123.20 - 123.21 -summary: [mq]: second.patch 123.22 - 123.23 -$ \textbf{hg export second.patch} 123.24 -# HG changeset patch 123.25 -# User Bryan O'Sullivan <bos@serpentine.com> 123.26 - 123.27 -# Node ID 123.28 -# Parent 123.29 -[mq]: second.patch 123.30 - 123.31 -diff -r -r other.c 123.32 - 123.33 - 123.34 -@@ -0,0 +1,1 @@ 123.35 -+double u;
124.1 --- a/en/examples/mq.qinit-help.help.out Mon Mar 09 21:13:56 2009 -0700 124.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 124.3 @@ -1,16 +0,0 @@ 124.4 -$ \textbf{hg help qinit} 124.5 -hg qinit [-c] 124.6 - 124.7 -init a new queue repository 124.8 - 124.9 - The queue repository is unversioned by default. If -c is 124.10 - specified, qinit will create a separate nested repository 124.11 - for patches (qinit -c may also be run later to convert 124.12 - an unversioned patch repository into a versioned one). 124.13 - You can use qcommit to commit changes to this queue repository. 124.14 - 124.15 -options: 124.16 - 124.17 - -c --create-repo create queue repository 124.18 - 124.19 -use "hg -v help qinit" to show global options
125.1 --- a/en/examples/mq.tarball.download.out Mon Mar 09 21:13:56 2009 -0700 125.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 125.3 @@ -1,9 +0,0 @@ 125.4 -$ \textbf{download netplug-1.2.5.tar.bz2} 125.5 -$ \textbf{tar jxf netplug-1.2.5.tar.bz2} 125.6 -$ \textbf{cd netplug-1.2.5} 125.7 -$ \textbf{hg init} 125.8 -$ \textbf{hg commit -q --addremove --message netplug-1.2.5} 125.9 -$ \textbf{cd ..} 125.10 -$ \textbf{hg clone netplug-1.2.5 netplug} 125.11 -updating working directory 125.12 -18 files updated, 0 files merged, 0 files removed, 0 files unresolved
126.1 --- a/en/examples/mq.tarball.newsource.out Mon Mar 09 21:13:56 2009 -0700 126.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 126.3 @@ -1,13 +0,0 @@ 126.4 -$ \textbf{hg qpop -a} 126.5 -patch queue now empty 126.6 -$ \textbf{cd ..} 126.7 -$ \textbf{download netplug-1.2.8.tar.bz2} 126.8 -$ \textbf{hg clone netplug-1.2.5 netplug-1.2.8} 126.9 -updating working directory 126.10 -18 files updated, 0 files merged, 0 files removed, 0 files unresolved 126.11 -$ \textbf{cd netplug-1.2.8} 126.12 -$ \textbf{hg locate -0 | xargs -0 rm} 126.13 -$ \textbf{cd ..} 126.14 -$ \textbf{tar jxf netplug-1.2.8.tar.bz2} 126.15 -$ \textbf{cd netplug-1.2.8} 126.16 -$ \textbf{hg commit --addremove --message netplug-1.2.8}
127.1 --- a/en/examples/mq.tarball.qinit.out Mon Mar 09 21:13:56 2009 -0700 127.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 127.3 @@ -1,28 +0,0 @@ 127.4 -$ \textbf{cd netplug} 127.5 -$ \textbf{hg qinit} 127.6 -$ \textbf{hg qnew -m 'fix build problem with gcc 4' build-fix.patch} 127.7 -$ \textbf{perl -pi -e 's/int addr_len/socklen_t addr_len/' netlink.c} 127.8 -$ \textbf{hg qrefresh} 127.9 -$ \textbf{hg tip -p} 127.10 -changeset: 127.11 -tag: qtip 127.12 -tag: build-fix.patch 127.13 -tag: tip 127.14 -tag: qbase 127.15 -user: Bryan O'Sullivan <bos@serpentine.com> 127.16 - 127.17 -summary: fix build problem with gcc 4 127.18 - 127.19 -diff -r -r netlink.c 127.20 - 127.21 - 127.22 -@@ -275,7 +275,7 @@ 127.23 - exit(1); 127.24 - \} 127.25 - 127.26 -- int addr_len = sizeof(addr); 127.27 -+ socklen_t addr_len = sizeof(addr); 127.28 - 127.29 - if (getsockname(fd, (struct sockaddr *) &addr, &addr_len) == -1) \{ 127.30 - do_log(LOG_ERR, "Could not get socket details: %m"); 127.31 -
128.1 --- a/en/examples/mq.tarball.repush.out Mon Mar 09 21:13:56 2009 -0700 128.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 128.3 @@ -1,13 +0,0 @@ 128.4 -$ \textbf{cd ../netplug} 128.5 -$ \textbf{hg pull ../netplug-1.2.8} 128.6 -pulling from ../netplug-1.2.8 128.7 -searching for changes 128.8 -adding changesets 128.9 -adding manifests 128.10 -adding file changes 128.11 -added 1 changesets with 12 changes to 12 files 128.12 -(run 'hg update' to get a working copy) 128.13 -$ \textbf{hg qpush -a} 128.14 -(working directory not at tip) 128.15 -applying build-fix.patch 128.16 -now at: build-fix.patch
129.1 --- a/en/examples/mq.tools.lsdiff.out Mon Mar 09 21:13:56 2009 -0700 129.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 129.3 @@ -1,21 +0,0 @@ 129.4 -$ \textbf{lsdiff -nvv remove-redundant-null-checks.patch} 129.5 -22 File #1 a/drivers/char/agp/sgi-agp.c 129.6 - 24 Hunk #1 static int __devinit agp_sgi_init(void) 129.7 -37 File #2 a/drivers/char/hvcs.c 129.8 - 39 Hunk #1 static struct tty_operations hvcs_ops = 129.9 - 53 Hunk #2 static int hvcs_alloc_index_list(int n) 129.10 -69 File #3 a/drivers/message/fusion/mptfc.c 129.11 - 71 Hunk #1 mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, in 129.12 -85 File #4 a/drivers/message/fusion/mptsas.c 129.13 - 87 Hunk #1 mptsas_probe_hba_phys(MPT_ADAPTER *ioc) 129.14 -98 File #5 a/drivers/net/fs_enet/fs_enet-mii.c 129.15 - 100 Hunk #1 static struct fs_enet_mii_bus *create_bu 129.16 -111 File #6 a/drivers/net/wireless/ipw2200.c 129.17 - 113 Hunk #1 static struct ipw_fw_error *ipw_alloc_er 129.18 - 126 Hunk #2 static ssize_t clear_error(struct device 129.19 - 140 Hunk #3 static void ipw_irq_tasklet(struct ipw_p 129.20 - 150 Hunk #4 static void ipw_pci_remove(struct pci_de 129.21 -164 File #7 a/drivers/scsi/libata-scsi.c 129.22 - 166 Hunk #1 int ata_cmd_ioctl(struct scsi_device *sc 129.23 -178 File #8 a/drivers/video/au1100fb.c 129.24 - 180 Hunk #1 void __exit au1100fb_cleanup(void)
130.1 --- a/en/examples/mq.tools.tools.out Mon Mar 09 21:13:56 2009 -0700 130.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 130.3 @@ -1,23 +0,0 @@ 130.4 -$ \textbf{diffstat -p1 remove-redundant-null-checks.patch} 130.5 - drivers/char/agp/sgi-agp.c | 5 ++--- 130.6 - drivers/char/hvcs.c | 11 +++++------ 130.7 - drivers/message/fusion/mptfc.c | 6 ++---- 130.8 - drivers/message/fusion/mptsas.c | 3 +-- 130.9 - drivers/net/fs_enet/fs_enet-mii.c | 3 +-- 130.10 - drivers/net/wireless/ipw2200.c | 22 ++++++---------------- 130.11 - drivers/scsi/libata-scsi.c | 4 +--- 130.12 - drivers/video/au1100fb.c | 3 +-- 130.13 - 8 files changed, 19 insertions(+), 38 deletions(-) 130.14 -$ \textbf{filterdiff -i '*/video/*' remove-redundant-null-checks.patch} 130.15 - 130.16 - 130.17 -@@ -743,8 +743,7 @@ void __exit au1100fb_cleanup(void) 130.18 - \{ 130.19 - driver_unregister(&au1100fb_driver); 130.20 - 130.21 -- if (drv_info.opt_mode) 130.22 -- kfree(drv_info.opt_mode); 130.23 -+ kfree(drv_info.opt_mode); 130.24 - \} 130.25 - 130.26 - module_init(au1100fb_init);
131.1 --- a/en/examples/mq.tutorial.add.out Mon Mar 09 21:13:56 2009 -0700 131.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 131.3 @@ -1,4 +0,0 @@ 131.4 -$ \textbf{echo 'file 3, line 1' >> file3} 131.5 -$ \textbf{hg qnew add-file3.patch} 131.6 -$ \textbf{hg qnew -f add-file3.patch} 131.7 -abort: patch "add-file3.patch" already exists
132.1 --- a/en/examples/mq.tutorial.qinit.out Mon Mar 09 21:13:56 2009 -0700 132.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 132.3 @@ -1,7 +0,0 @@ 132.4 -$ \textbf{hg init mq-sandbox} 132.5 -$ \textbf{cd mq-sandbox} 132.6 -$ \textbf{echo 'line 1' > file1} 132.7 -$ \textbf{echo 'another line 1' > file2} 132.8 -$ \textbf{hg add file1 file2} 132.9 -$ \textbf{hg commit -m'first change'} 132.10 -$ \textbf{hg qinit}
133.1 --- a/en/examples/mq.tutorial.qnew.out Mon Mar 09 21:13:56 2009 -0700 133.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 133.3 @@ -1,20 +0,0 @@ 133.4 -$ \textbf{hg tip} 133.5 -changeset: 133.6 -tag: tip 133.7 -user: Bryan O'Sullivan <bos@serpentine.com> 133.8 - 133.9 -summary: first change 133.10 - 133.11 -$ \textbf{hg qnew first.patch} 133.12 -$ \textbf{hg tip} 133.13 -changeset: 133.14 -tag: qtip 133.15 -tag: first.patch 133.16 -tag: tip 133.17 -tag: qbase 133.18 -user: Bryan O'Sullivan <bos@serpentine.com> 133.19 - 133.20 -summary: [mq]: first.patch 133.21 - 133.22 -$ \textbf{ls .hg/patches} 133.23 -first.patch series status
134.1 --- a/en/examples/mq.tutorial.qnew2.out Mon Mar 09 21:13:56 2009 -0700 134.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 134.3 @@ -1,28 +0,0 @@ 134.4 -$ \textbf{hg qnew second.patch} 134.5 -$ \textbf{hg log --style=compact --limit=2} 134.6 -2[qtip,second.patch,tip] 2009-01-30 06:34 +0000 bos 134.7 - [mq]: second.patch 134.8 - 134.9 -1[first.patch,qbase] 2009-01-30 06:34 +0000 bos 134.10 - [mq]: first.patch 134.11 - 134.12 -$ \textbf{echo 'line 4' >> file1} 134.13 -$ \textbf{hg qrefresh} 134.14 -$ \textbf{hg tip --style=compact --patch} 134.15 -2[qtip,second.patch,tip] 2009-01-30 06:34 +0000 bos 134.16 - [mq]: second.patch 134.17 - 134.18 -diff -r -r file1 134.19 - 134.20 - 134.21 -@@ -1,3 +1,4 @@ 134.22 - line 1 134.23 - line 2 134.24 - line 3 134.25 -+line 4 134.26 - 134.27 -$ \textbf{hg annotate file1} 134.28 -0: line 1 134.29 -1: line 2 134.30 -1: line 3 134.31 -2: line 4
135.1 --- a/en/examples/mq.tutorial.qpop.out Mon Mar 09 21:13:56 2009 -0700 135.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 135.3 @@ -1,14 +0,0 @@ 135.4 -$ \textbf{hg qapplied} 135.5 -first.patch 135.6 -second.patch 135.7 -$ \textbf{hg qpop} 135.8 -now at: first.patch 135.9 -$ \textbf{hg qseries} 135.10 -first.patch 135.11 -second.patch 135.12 -$ \textbf{hg qapplied} 135.13 -first.patch 135.14 -$ \textbf{cat file1} 135.15 -line 1 135.16 -line 2 135.17 -line 3
136.1 --- a/en/examples/mq.tutorial.qpush-a.out Mon Mar 09 21:13:56 2009 -0700 136.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 136.3 @@ -1,8 +0,0 @@ 136.4 -$ \textbf{hg qpush -a} 136.5 -applying second.patch 136.6 -now at: second.patch 136.7 -$ \textbf{cat file1} 136.8 -line 1 136.9 -line 2 136.10 -line 3 136.11 -line 4
137.1 --- a/en/examples/mq.tutorial.qrefresh.out Mon Mar 09 21:13:56 2009 -0700 137.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 137.3 @@ -1,21 +0,0 @@ 137.4 -$ \textbf{echo 'line 2' >> file1} 137.5 -$ \textbf{hg diff} 137.6 -diff -r file1 137.7 - 137.8 - 137.9 -@@ -1,1 +1,2 @@ 137.10 - line 1 137.11 -+line 2 137.12 -$ \textbf{hg qrefresh} 137.13 -$ \textbf{hg diff} 137.14 -$ \textbf{hg tip --style=compact --patch} 137.15 -1[qtip,first.patch,tip,qbase] 2009-01-30 06:34 +0000 bos 137.16 - [mq]: first.patch 137.17 - 137.18 -diff -r -r file1 137.19 - 137.20 - 137.21 -@@ -1,1 +1,2 @@ 137.22 - line 1 137.23 -+line 2 137.24 -
138.1 --- a/en/examples/mq.tutorial.qrefresh2.out Mon Mar 09 21:13:56 2009 -0700 138.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 138.3 @@ -1,16 +0,0 @@ 138.4 -$ \textbf{echo 'line 3' >> file1} 138.5 -$ \textbf{hg status} 138.6 -M file1 138.7 -$ \textbf{hg qrefresh} 138.8 -$ \textbf{hg tip --style=compact --patch} 138.9 -1[qtip,first.patch,tip,qbase] 2009-01-30 06:34 +0000 bos 138.10 - [mq]: first.patch 138.11 - 138.12 -diff -r -r file1 138.13 - 138.14 - 138.15 -@@ -1,1 +1,3 @@ 138.16 - line 1 138.17 -+line 2 138.18 -+line 3 138.19 -
139.1 --- a/en/examples/mq.tutorial.qseries.out Mon Mar 09 21:13:56 2009 -0700 139.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 139.3 @@ -1,6 +0,0 @@ 139.4 -$ \textbf{hg qseries} 139.5 -first.patch 139.6 -second.patch 139.7 -$ \textbf{hg qapplied} 139.8 -first.patch 139.9 -second.patch
140.1 --- a/en/examples/rename.divergent.clone.out Mon Mar 09 21:13:56 2009 -0700 140.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 140.3 @@ -1,6 +0,0 @@ 140.4 -$ \textbf{hg clone orig anne} 140.5 -updating working directory 140.6 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 140.7 -$ \textbf{hg clone orig bob} 140.8 -updating working directory 140.9 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
141.1 --- a/en/examples/rename.divergent.merge.out Mon Mar 09 21:13:56 2009 -0700 141.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 141.3 @@ -1,26 +0,0 @@ 141.4 -# See http://www.selenic.com/mercurial/bts/issue455 141.5 -$ \textbf{cd ../orig} 141.6 -$ \textbf{hg pull -u ../anne} 141.7 -pulling from ../anne 141.8 -searching for changes 141.9 -adding changesets 141.10 -adding manifests 141.11 -adding file changes 141.12 -added 1 changesets with 1 changes to 1 files 141.13 -1 files updated, 0 files merged, 1 files removed, 0 files unresolved 141.14 -$ \textbf{hg pull ../bob} 141.15 -pulling from ../bob 141.16 -searching for changes 141.17 -adding changesets 141.18 -adding manifests 141.19 -adding file changes 141.20 -added 1 changesets with 1 changes to 1 files (+1 heads) 141.21 -(run 'hg heads' to see heads, 'hg merge' to merge) 141.22 -$ \textbf{hg merge} 141.23 -warning: detected divergent renames of foo to: 141.24 - bar 141.25 - quux 141.26 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 141.27 -(branch merge, don't forget to commit) 141.28 -$ \textbf{ls} 141.29 -bar quux
142.1 --- a/en/examples/rename.divergent.rename.anne.out Mon Mar 09 21:13:56 2009 -0700 142.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 142.3 @@ -1,3 +0,0 @@ 142.4 -$ \textbf{cd anne} 142.5 -$ \textbf{hg mv foo bar} 142.6 -$ \textbf{hg ci -m 'Rename foo to bar'}
143.1 --- a/en/examples/rename.divergent.rename.bob.out Mon Mar 09 21:13:56 2009 -0700 143.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 143.3 @@ -1,3 +0,0 @@ 143.4 -$ \textbf{cd ../bob} 143.5 -$ \textbf{hg mv foo quux} 143.6 -$ \textbf{hg ci -m 'Rename foo to quux'}
144.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 144.2 +++ b/en/examples/results/backout.init.out Mon Mar 09 21:37:47 2009 -0700 144.3 @@ -0,0 +1,7 @@ 144.4 +$ \textbf{hg init myrepo} 144.5 +$ \textbf{cd myrepo} 144.6 +$ \textbf{echo first change >> myfile} 144.7 +$ \textbf{hg add myfile} 144.8 +$ \textbf{hg commit -m 'first change'} 144.9 +$ \textbf{echo second change >> myfile} 144.10 +$ \textbf{hg commit -m 'second change'}
145.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 145.2 +++ b/en/examples/results/backout.manual.backout.out Mon Mar 09 21:37:47 2009 -0700 145.3 @@ -0,0 +1,8 @@ 145.4 +$ \textbf{echo third change >> myfile} 145.5 +$ \textbf{hg commit -m 'third change'} 145.6 +$ \textbf{hg backout -m 'back out second change' 1} 145.7 +reverting myfile 145.8 +created new head 145.9 +changeset backs out changeset 145.10 +the backout changeset is a new head - do not forget to merge 145.11 +(use "backout --merge" if you want to auto-merge)
146.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 146.2 +++ b/en/examples/results/backout.manual.cat.out Mon Mar 09 21:37:47 2009 -0700 146.3 @@ -0,0 +1,4 @@ 146.4 +$ \textbf{cat myfile} 146.5 +first change 146.6 +second change 146.7 +third change
147.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 147.2 +++ b/en/examples/results/backout.manual.clone.out Mon Mar 09 21:37:47 2009 -0700 147.3 @@ -0,0 +1,10 @@ 147.4 +$ \textbf{cd ..} 147.5 +$ \textbf{hg clone -r1 myrepo newrepo} 147.6 +requesting all changes 147.7 +adding changesets 147.8 +adding manifests 147.9 +adding file changes 147.10 +added 2 changesets with 2 changes to 1 files 147.11 +updating working directory 147.12 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 147.13 +$ \textbf{cd newrepo}
148.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 148.2 +++ b/en/examples/results/backout.manual.heads.out Mon Mar 09 21:37:47 2009 -0700 148.3 @@ -0,0 +1,13 @@ 148.4 +$ \textbf{hg heads} 148.5 +changeset: 148.6 +tag: tip 148.7 +parent: 148.8 +user: Bryan O'Sullivan <bos@serpentine.com> 148.9 + 148.10 +summary: back out second change 148.11 + 148.12 +changeset: 148.13 +user: Bryan O'Sullivan <bos@serpentine.com> 148.14 + 148.15 +summary: third change 148.16 +
149.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 149.2 +++ b/en/examples/results/backout.manual.log.out Mon Mar 09 21:37:47 2009 -0700 149.3 @@ -0,0 +1,13 @@ 149.4 +$ \textbf{hg log --style compact} 149.5 +3[tip]:1 2009-01-30 06:32 +0000 bos 149.6 + back out second change 149.7 + 149.8 +2 2009-01-30 06:32 +0000 bos 149.9 + third change 149.10 + 149.11 +1 2009-01-30 06:32 +0000 bos 149.12 + second change 149.13 + 149.14 +0 2009-01-30 06:32 +0000 bos 149.15 + first change 149.16 +
150.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 150.2 +++ b/en/examples/results/backout.manual.merge.out Mon Mar 09 21:37:47 2009 -0700 150.3 @@ -0,0 +1,8 @@ 150.4 +$ \textbf{hg merge} 150.5 +merging myfile 150.6 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved 150.7 +(branch merge, don't forget to commit) 150.8 +$ \textbf{hg commit -m 'merged backout with previous tip'} 150.9 +$ \textbf{cat myfile} 150.10 +first change 150.11 +third change
151.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 151.2 +++ b/en/examples/results/backout.manual.parents.out Mon Mar 09 21:37:47 2009 -0700 151.3 @@ -0,0 +1,6 @@ 151.4 +$ \textbf{hg parents} 151.5 +changeset: 151.6 +user: Bryan O'Sullivan <bos@serpentine.com> 151.7 + 151.8 +summary: third change 151.9 +
152.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 152.2 +++ b/en/examples/results/backout.non-tip.backout.out Mon Mar 09 21:37:47 2009 -0700 152.3 @@ -0,0 +1,10 @@ 152.4 +$ \textbf{echo third change >> myfile} 152.5 +$ \textbf{hg commit -m 'third change'} 152.6 +$ \textbf{hg backout --merge -m 'back out second change' 1} 152.7 +reverting myfile 152.8 +created new head 152.9 +changeset backs out changeset 152.10 +merging with changeset 152.11 +merging myfile 152.12 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved 152.13 +(branch merge, don't forget to commit)
153.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 153.2 +++ b/en/examples/results/backout.non-tip.cat.out Mon Mar 09 21:37:47 2009 -0700 153.3 @@ -0,0 +1,3 @@ 153.4 +$ \textbf{cat myfile} 153.5 +first change 153.6 +third change
154.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 154.2 +++ b/en/examples/results/backout.non-tip.clone.out Mon Mar 09 21:37:47 2009 -0700 154.3 @@ -0,0 +1,10 @@ 154.4 +$ \textbf{cd ..} 154.5 +$ \textbf{hg clone -r1 myrepo non-tip-repo} 154.6 +requesting all changes 154.7 +adding changesets 154.8 +adding manifests 154.9 +adding file changes 154.10 +added 2 changesets with 2 changes to 1 files 154.11 +updating working directory 154.12 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 154.13 +$ \textbf{cd non-tip-repo}
155.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 155.2 +++ b/en/examples/results/backout.simple.log.out Mon Mar 09 21:37:47 2009 -0700 155.3 @@ -0,0 +1,10 @@ 155.4 +$ \textbf{hg log --style compact} 155.5 +2[tip] 2009-01-30 06:32 +0000 bos 155.6 + back out second change 155.7 + 155.8 +1 2009-01-30 06:32 +0000 bos 155.9 + second change 155.10 + 155.11 +0 2009-01-30 06:32 +0000 bos 155.12 + first change 155.13 +
156.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 156.2 +++ b/en/examples/results/backout.simple.out Mon Mar 09 21:37:47 2009 -0700 156.3 @@ -0,0 +1,5 @@ 156.4 +$ \textbf{hg backout -m 'back out second change' tip} 156.5 +reverting myfile 156.6 +changeset backs out changeset 156.7 +$ \textbf{cat myfile} 156.8 +first change
157.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 157.2 +++ b/en/examples/results/bisect.commits.out Mon Mar 09 21:37:47 2009 -0700 157.3 @@ -0,0 +1,10 @@ 157.4 + 157.5 + 157.6 + 157.7 + 157.8 + 157.9 + 157.10 + 157.11 + 157.12 + 157.13 +
158.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 158.2 +++ b/en/examples/results/bisect.help.out Mon Mar 09 21:37:47 2009 -0700 158.3 @@ -0,0 +1,33 @@ 158.4 + 158.5 + 158.6 + 158.7 + 158.8 + 158.9 + 158.10 + 158.11 + 158.12 + 158.13 + 158.14 + 158.15 + 158.16 + 158.17 + 158.18 + 158.19 + 158.20 + 158.21 + 158.22 + 158.23 + 158.24 + 158.25 + 158.26 + 158.27 + 158.28 + 158.29 + 158.30 + 158.31 + 158.32 + 158.33 + 158.34 + 158.35 + 158.36 +
159.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 159.2 +++ b/en/examples/results/bisect.init.out Mon Mar 09 21:37:47 2009 -0700 159.3 @@ -0,0 +1,2 @@ 159.4 + 159.5 +
160.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 160.2 +++ b/en/examples/results/bisect.search.bad-init.out Mon Mar 09 21:37:47 2009 -0700 160.3 @@ -0,0 +1,2 @@ 160.4 + 160.5 +
161.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 161.2 +++ b/en/examples/results/bisect.search.good-init.out Mon Mar 09 21:37:47 2009 -0700 161.3 @@ -0,0 +1,4 @@ 161.4 + 161.5 + 161.6 + 161.7 +
162.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 162.2 +++ b/en/examples/results/bisect.search.init.out Mon Mar 09 21:37:47 2009 -0700 162.3 @@ -0,0 +1,2 @@ 162.4 + 162.5 +
163.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 163.2 +++ b/en/examples/results/bisect.search.mytest.out Mon Mar 09 21:37:47 2009 -0700 163.3 @@ -0,0 +1,10 @@ 163.4 + 163.5 + 163.6 + 163.7 + 163.8 + 163.9 + 163.10 + 163.11 + 163.12 + 163.13 +
164.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 164.2 +++ b/en/examples/results/bisect.search.reset.out Mon Mar 09 21:37:47 2009 -0700 164.3 @@ -0,0 +1,2 @@ 164.4 + 164.5 +
165.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 165.2 +++ b/en/examples/results/bisect.search.rest.out Mon Mar 09 21:37:47 2009 -0700 165.3 @@ -0,0 +1,19 @@ 165.4 + 165.5 + 165.6 + 165.7 + 165.8 + 165.9 + 165.10 + 165.11 + 165.12 + 165.13 + 165.14 + 165.15 + 165.16 + 165.17 + 165.18 + 165.19 + 165.20 + 165.21 + 165.22 +
166.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 166.2 +++ b/en/examples/results/bisect.search.step1.out Mon Mar 09 21:37:47 2009 -0700 166.3 @@ -0,0 +1,11 @@ 166.4 + 166.5 + 166.6 + 166.7 + 166.8 + 166.9 + 166.10 + 166.11 + 166.12 + 166.13 + 166.14 +
167.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 167.2 +++ b/en/examples/results/bisect.search.step2.out Mon Mar 09 21:37:47 2009 -0700 167.3 @@ -0,0 +1,5 @@ 167.4 + 167.5 + 167.6 + 167.7 + 167.8 +
168.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 168.2 +++ b/en/examples/results/branch-named.branch.out Mon Mar 09 21:37:47 2009 -0700 168.3 @@ -0,0 +1,2 @@ 168.4 +$ \textbf{hg branch} 168.5 +default
169.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 169.2 +++ b/en/examples/results/branch-named.branches.out Mon Mar 09 21:37:47 2009 -0700 169.3 @@ -0,0 +1,9 @@ 169.4 +$ \textbf{hg tip} 169.5 +changeset: 169.6 +tag: tip 169.7 +user: Bryan O'Sullivan <bos@serpentine.com> 169.8 + 169.9 +summary: Initial commit 169.10 + 169.11 +$ \textbf{hg branches} 169.12 +default
170.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 170.2 +++ b/en/examples/results/branch-named.commit.out Mon Mar 09 21:37:47 2009 -0700 170.3 @@ -0,0 +1,10 @@ 170.4 +$ \textbf{echo 'hello again' >> myfile} 170.5 +$ \textbf{hg commit -m 'Second commit'} 170.6 +$ \textbf{hg tip} 170.7 +changeset: 170.8 +branch: foo 170.9 +tag: tip 170.10 +user: Bryan O'Sullivan <bos@serpentine.com> 170.11 + 170.12 +summary: Second commit 170.13 +
171.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 171.2 +++ b/en/examples/results/branch-named.create.out Mon Mar 09 21:37:47 2009 -0700 171.3 @@ -0,0 +1,4 @@ 171.4 +$ \textbf{hg branch foo} 171.5 +marked working directory as branch foo 171.6 +$ \textbf{hg branch} 171.7 +foo
172.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 172.2 +++ b/en/examples/results/branch-named.foo-commit.out Mon Mar 09 21:37:47 2009 -0700 172.3 @@ -0,0 +1,19 @@ 172.4 +$ \textbf{echo something > somefile} 172.5 +$ \textbf{hg commit -A -m 'New file'} 172.6 +adding somefile 172.7 +created new head 172.8 +$ \textbf{hg heads} 172.9 +changeset: 172.10 +branch: foo 172.11 +tag: tip 172.12 +parent: 172.13 +user: Bryan O'Sullivan <bos@serpentine.com> 172.14 + 172.15 +summary: New file 172.16 + 172.17 +changeset: 172.18 +branch: bar 172.19 +user: Bryan O'Sullivan <bos@serpentine.com> 172.20 + 172.21 +summary: Third commit 172.22 +
173.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 173.2 +++ b/en/examples/results/branch-named.merge.out Mon Mar 09 21:37:47 2009 -0700 173.3 @@ -0,0 +1,16 @@ 173.4 +$ \textbf{hg branch} 173.5 +bar 173.6 +$ \textbf{hg merge foo} 173.7 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 173.8 +(branch merge, don't forget to commit) 173.9 +$ \textbf{hg commit -m 'Merge'} 173.10 +$ \textbf{hg tip} 173.11 +changeset: 173.12 +branch: bar 173.13 +tag: tip 173.14 +parent: 173.15 +parent: 173.16 +user: Bryan O'Sullivan <bos@serpentine.com> 173.17 + 173.18 +summary: Merge 173.19 +
174.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 174.2 +++ b/en/examples/results/branch-named.parents.out Mon Mar 09 21:37:47 2009 -0700 174.3 @@ -0,0 +1,12 @@ 174.4 +$ \textbf{hg parents} 174.5 +changeset: 174.6 +branch: bar 174.7 +tag: tip 174.8 +user: Bryan O'Sullivan <bos@serpentine.com> 174.9 + 174.10 +summary: Third commit 174.11 + 174.12 +$ \textbf{hg branches} 174.13 +bar 174.14 +foo (inactive) 174.15 +default (inactive)
175.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 175.2 +++ b/en/examples/results/branch-named.rebranch.out Mon Mar 09 21:37:47 2009 -0700 175.3 @@ -0,0 +1,15 @@ 175.4 +$ \textbf{hg branch} 175.5 +foo 175.6 +$ \textbf{hg branch bar} 175.7 +marked working directory as branch bar 175.8 +$ \textbf{echo new file > newfile} 175.9 +$ \textbf{hg commit -A -m 'Third commit'} 175.10 +adding newfile 175.11 +$ \textbf{hg tip} 175.12 +changeset: 175.13 +branch: bar 175.14 +tag: tip 175.15 +user: Bryan O'Sullivan <bos@serpentine.com> 175.16 + 175.17 +summary: Third commit 175.18 +
176.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 176.2 +++ b/en/examples/results/branch-named.status.out Mon Mar 09 21:37:47 2009 -0700 176.3 @@ -0,0 +1,8 @@ 176.4 +$ \textbf{hg status} 176.5 +$ \textbf{hg tip} 176.6 +changeset: 176.7 +tag: tip 176.8 +user: Bryan O'Sullivan <bos@serpentine.com> 176.9 + 176.10 +summary: Initial commit 176.11 +
177.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 177.2 +++ b/en/examples/results/branch-named.update-bar.out Mon Mar 09 21:37:47 2009 -0700 177.3 @@ -0,0 +1,2 @@ 177.4 +$ \textbf{hg update bar} 177.5 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved
178.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 178.2 +++ b/en/examples/results/branch-named.update-foo.out Mon Mar 09 21:37:47 2009 -0700 178.3 @@ -0,0 +1,13 @@ 178.4 +$ \textbf{hg update foo} 178.5 +0 files updated, 0 files merged, 1 files removed, 0 files unresolved 178.6 +$ \textbf{hg update} 178.7 +0 files updated, 0 files merged, 0 files removed, 0 files unresolved 178.8 +$ \textbf{hg parents} 178.9 +changeset: 178.10 +branch: foo 178.11 +user: Bryan O'Sullivan <bos@serpentine.com> 178.12 + 178.13 +summary: Second commit 178.14 + 178.15 +$ \textbf{hg update bar} 178.16 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved
179.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 179.2 +++ b/en/examples/results/branch-named.update-nothing.out Mon Mar 09 21:37:47 2009 -0700 179.3 @@ -0,0 +1,4 @@ 179.4 +$ \textbf{hg update foo} 179.5 +0 files updated, 0 files merged, 1 files removed, 0 files unresolved 179.6 +$ \textbf{hg update} 179.7 +0 files updated, 0 files merged, 0 files removed, 0 files unresolved
180.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 180.2 +++ b/en/examples/results/branch-named.update-switchy.out Mon Mar 09 21:37:47 2009 -0700 180.3 @@ -0,0 +1,19 @@ 180.4 +$ \textbf{hg update foo} 180.5 +0 files updated, 0 files merged, 1 files removed, 0 files unresolved 180.6 +$ \textbf{hg parents} 180.7 +changeset: 180.8 +branch: foo 180.9 +user: Bryan O'Sullivan <bos@serpentine.com> 180.10 + 180.11 +summary: Second commit 180.12 + 180.13 +$ \textbf{hg update bar} 180.14 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 180.15 +$ \textbf{hg parents} 180.16 +changeset: 180.17 +branch: bar 180.18 +tag: tip 180.19 +user: Bryan O'Sullivan <bos@serpentine.com> 180.20 + 180.21 +summary: Third commit 180.22 +
181.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 181.2 +++ b/en/examples/results/branch-named.update.out Mon Mar 09 21:37:47 2009 -0700 181.3 @@ -0,0 +1,13 @@ 181.4 +$ \textbf{hg update foo} 181.5 +0 files updated, 0 files merged, 1 files removed, 0 files unresolved 181.6 +$ \textbf{hg update} 181.7 +0 files updated, 0 files merged, 0 files removed, 0 files unresolved 181.8 +$ \textbf{hg parent} 181.9 +changeset: 181.10 +branch: foo 181.11 +user: Bryan O'Sullivan <bos@serpentine.com> 181.12 + 181.13 +summary: Second commit 181.14 + 181.15 +$ \textbf{hg update bar} 181.16 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved
182.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 182.2 +++ b/en/examples/results/branch-repo.bugfix.out Mon Mar 09 21:37:47 2009 -0700 182.3 @@ -0,0 +1,13 @@ 182.4 +$ \textbf{hg clone myproject-1.0.1 my-1.0.1-bugfix} 182.5 +updating working directory 182.6 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved 182.7 +$ \textbf{cd my-1.0.1-bugfix} 182.8 +$ \textbf{echo 'I fixed a bug using only echo!' >> myfile} 182.9 +$ \textbf{hg commit -m 'Important fix for 1.0.1'} 182.10 +$ \textbf{hg push} 182.11 +pushing to 182.12 +searching for changes 182.13 +adding changesets 182.14 +adding manifests 182.15 +adding file changes 182.16 +added 1 changesets with 1 changes to 1 files
183.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 183.2 +++ b/en/examples/results/branch-repo.clone.out Mon Mar 09 21:37:47 2009 -0700 183.3 @@ -0,0 +1,4 @@ 183.4 +$ \textbf{cd ..} 183.5 +$ \textbf{hg clone myproject myproject-1.0.1} 183.6 +updating working directory 183.7 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved
184.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 184.2 +++ b/en/examples/results/branch-repo.merge.out Mon Mar 09 21:37:47 2009 -0700 184.3 @@ -0,0 +1,11 @@ 184.4 +$ \textbf{hg merge} 184.5 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 184.6 +(branch merge, don't forget to commit) 184.7 +$ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'} 184.8 +$ \textbf{hg push} 184.9 +pushing to 184.10 +searching for changes 184.11 +adding changesets 184.12 +adding manifests 184.13 +adding file changes 184.14 +added 2 changesets with 1 changes to 1 files
185.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 185.2 +++ b/en/examples/results/branch-repo.new.out Mon Mar 09 21:37:47 2009 -0700 185.3 @@ -0,0 +1,15 @@ 185.4 +$ \textbf{cd ..} 185.5 +$ \textbf{hg clone myproject my-feature} 185.6 +updating working directory 185.7 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved 185.8 +$ \textbf{cd my-feature} 185.9 +$ \textbf{echo 'This sure is an exciting new feature!' > mynewfile} 185.10 +$ \textbf{hg commit -A -m 'New feature'} 185.11 +adding mynewfile 185.12 +$ \textbf{hg push} 185.13 +pushing to 185.14 +searching for changes 185.15 +adding changesets 185.16 +adding manifests 185.17 +adding file changes 185.18 +added 1 changesets with 1 changes to 1 files
186.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 186.2 +++ b/en/examples/results/branch-repo.pull.out Mon Mar 09 21:37:47 2009 -0700 186.3 @@ -0,0 +1,13 @@ 186.4 +$ \textbf{cd ..} 186.5 +$ \textbf{hg clone myproject myproject-merge} 186.6 +updating working directory 186.7 +3 files updated, 0 files merged, 0 files removed, 0 files unresolved 186.8 +$ \textbf{cd myproject-merge} 186.9 +$ \textbf{hg pull ../myproject-1.0.1} 186.10 +pulling from ../myproject-1.0.1 186.11 +searching for changes 186.12 +adding changesets 186.13 +adding manifests 186.14 +adding file changes 186.15 +added 1 changesets with 1 changes to 1 files (+1 heads) 186.16 +(run 'hg heads' to see heads, 'hg merge' to merge)
187.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 187.2 +++ b/en/examples/results/branch-repo.tag.out Mon Mar 09 21:37:47 2009 -0700 187.3 @@ -0,0 +1,2 @@ 187.4 +$ \textbf{cd myproject} 187.5 +$ \textbf{hg tag v1.0}
188.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 188.2 +++ b/en/examples/results/branching.clone.out Mon Mar 09 21:37:47 2009 -0700 188.3 @@ -0,0 +1,9 @@ 188.4 +$ \textbf{cd ..} 188.5 +$ \textbf{hg clone -rv1.0 main stable} 188.6 +requesting all changes 188.7 +adding changesets 188.8 +adding manifests 188.9 +adding file changes 188.10 +added 1 changesets with 1 changes to 1 files 188.11 +updating working directory 188.12 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved
189.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 189.2 +++ b/en/examples/results/branching.init.out Mon Mar 09 21:37:47 2009 -0700 189.3 @@ -0,0 +1,5 @@ 189.4 +$ \textbf{hg init main} 189.5 +$ \textbf{cd main} 189.6 +$ \textbf{echo 'This is a boring feature.' > myfile} 189.7 +$ \textbf{hg commit -A -m 'We have reached an important milestone!'} 189.8 +adding myfile
190.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 190.2 +++ b/en/examples/results/branching.main.out Mon Mar 09 21:37:47 2009 -0700 190.3 @@ -0,0 +1,6 @@ 190.4 +$ \textbf{cd ../main} 190.5 +$ \textbf{echo 'This is exciting and new!' >> myfile} 190.6 +$ \textbf{hg commit -m 'Add a new feature'} 190.7 +$ \textbf{cat myfile} 190.8 +This is a boring feature. 190.9 +This is exciting and new!
191.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 191.2 +++ b/en/examples/results/branching.merge.out Mon Mar 09 21:37:47 2009 -0700 191.3 @@ -0,0 +1,17 @@ 191.4 +$ \textbf{cd ../main} 191.5 +$ \textbf{hg pull ../stable} 191.6 +pulling from ../stable 191.7 +searching for changes 191.8 +adding changesets 191.9 +adding manifests 191.10 +adding file changes 191.11 +added 1 changesets with 1 changes to 1 files (+1 heads) 191.12 +(run 'hg heads' to see heads, 'hg merge' to merge) 191.13 +$ \textbf{hg merge} 191.14 +merging myfile 191.15 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved 191.16 +(branch merge, don't forget to commit) 191.17 +$ \textbf{hg commit -m 'Bring in bugfix from stable branch'} 191.18 +$ \textbf{cat myfile} 191.19 +This is a fix to a boring feature. 191.20 +This is exciting and new!
192.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 192.2 +++ b/en/examples/results/branching.stable.out Mon Mar 09 21:37:47 2009 -0700 192.3 @@ -0,0 +1,13 @@ 192.4 +$ \textbf{hg clone stable stable-fix} 192.5 +updating working directory 192.6 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 192.7 +$ \textbf{cd stable-fix} 192.8 +$ \textbf{echo 'This is a fix to a boring feature.' > myfile} 192.9 +$ \textbf{hg commit -m 'Fix a bug'} 192.10 +$ \textbf{hg push} 192.11 +pushing to 192.12 +searching for changes 192.13 +adding changesets 192.14 +adding manifests 192.15 +adding file changes 192.16 +added 1 changesets with 1 changes to 1 files
193.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 193.2 +++ b/en/examples/results/branching.tag.out Mon Mar 09 21:37:47 2009 -0700 193.3 @@ -0,0 +1,11 @@ 193.4 +$ \textbf{hg tag v1.0} 193.5 +$ \textbf{hg tip} 193.6 +changeset: 193.7 +tag: tip 193.8 +user: Bryan O'Sullivan <bos@serpentine.com> 193.9 + 193.10 +summary: Added tag v1.0 for changeset 193.11 + 193.12 +$ \textbf{hg tags} 193.13 +tip 193.14 +v1.0
194.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 194.2 +++ b/en/examples/results/branching.update.out Mon Mar 09 21:37:47 2009 -0700 194.3 @@ -0,0 +1,7 @@ 194.4 +$ \textbf{cd ..} 194.5 +$ \textbf{hg clone -U main main-old} 194.6 +$ \textbf{cd main-old} 194.7 +$ \textbf{hg update v1.0} 194.8 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 194.9 +$ \textbf{cat myfile} 194.10 +This is a boring feature.
195.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 195.2 +++ b/en/examples/results/cmdref.diff-p.out Mon Mar 09 21:37:47 2009 -0700 195.3 @@ -0,0 +1,22 @@ 195.4 +$ \textbf{echo '[diff]' >> $HGRC} 195.5 +$ \textbf{echo 'showfunc = False' >> $HGRC} 195.6 +$ \textbf{hg diff} 195.7 +diff -r myfile.c 195.8 + 195.9 + 195.10 +@@ -1,4 +1,4 @@ 195.11 + int myfunc() 195.12 + \{ 195.13 +- return 1; 195.14 ++ return 10; 195.15 + \} 195.16 +$ \textbf{hg diff -p} 195.17 +diff -r myfile.c 195.18 + 195.19 + 195.20 +@@ -1,4 +1,4 @@ 195.21 + int myfunc() 195.22 + \{ 195.23 +- return 1; 195.24 ++ return 10; 195.25 + \}
196.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 196.2 +++ b/en/examples/results/daily.copy.after.out Mon Mar 09 21:37:47 2009 -0700 196.3 @@ -0,0 +1,2 @@ 196.4 +$ \textbf{cp a z} 196.5 +$ \textbf{hg copy --after a z}
197.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 197.2 +++ b/en/examples/results/daily.copy.cat.out Mon Mar 09 21:37:47 2009 -0700 197.3 @@ -0,0 +1,5 @@ 197.4 +$ \textbf{cat file} 197.5 +line 197.6 +new contents 197.7 +$ \textbf{cat ../my-copy/new-file} 197.8 +line
198.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 198.2 +++ b/en/examples/results/daily.copy.clone.out Mon Mar 09 21:37:47 2009 -0700 198.3 @@ -0,0 +1,4 @@ 198.4 +$ \textbf{cd ..} 198.5 +$ \textbf{hg clone my-copy your-copy} 198.6 +updating working directory 198.7 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved
199.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 199.2 +++ b/en/examples/results/daily.copy.copy.out Mon Mar 09 21:37:47 2009 -0700 199.3 @@ -0,0 +1,2 @@ 199.4 +$ \textbf{cd my-copy} 199.5 +$ \textbf{hg copy file new-file}
200.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 200.2 +++ b/en/examples/results/daily.copy.dir-dest.out Mon Mar 09 21:37:47 2009 -0700 200.3 @@ -0,0 +1,4 @@ 200.4 +$ \textbf{mkdir d} 200.5 +$ \textbf{hg copy a b d} 200.6 +$ \textbf{ls d} 200.7 +a b
201.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 201.2 +++ b/en/examples/results/daily.copy.dir-src-dest.out Mon Mar 09 21:37:47 2009 -0700 201.3 @@ -0,0 +1,2 @@ 201.4 +$ \textbf{hg copy c d} 201.5 +copying c/a/c to d/c/a/c
202.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 202.2 +++ b/en/examples/results/daily.copy.dir-src.out Mon Mar 09 21:37:47 2009 -0700 202.3 @@ -0,0 +1,2 @@ 202.4 +$ \textbf{hg copy c e} 202.5 +copying c/a/c to e/a/c
203.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 203.2 +++ b/en/examples/results/daily.copy.init.out Mon Mar 09 21:37:47 2009 -0700 203.3 @@ -0,0 +1,5 @@ 203.4 +$ \textbf{hg init my-copy} 203.5 +$ \textbf{cd my-copy} 203.6 +$ \textbf{echo line > file} 203.7 +$ \textbf{hg add file} 203.8 +$ \textbf{hg commit -m 'Added a file'}
204.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 204.2 +++ b/en/examples/results/daily.copy.merge.out Mon Mar 09 21:37:47 2009 -0700 204.3 @@ -0,0 +1,15 @@ 204.4 +$ \textbf{hg pull ../my-copy} 204.5 +pulling from ../my-copy 204.6 +searching for changes 204.7 +adding changesets 204.8 +adding manifests 204.9 +adding file changes 204.10 +added 1 changesets with 1 changes to 1 files (+1 heads) 204.11 +(run 'hg heads' to see heads, 'hg merge' to merge) 204.12 +$ \textbf{hg merge} 204.13 +merging file and new-file to new-file 204.14 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved 204.15 +(branch merge, don't forget to commit) 204.16 +$ \textbf{cat new-file} 204.17 +line 204.18 +new contents
205.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 205.2 +++ b/en/examples/results/daily.copy.other.out Mon Mar 09 21:37:47 2009 -0700 205.3 @@ -0,0 +1,3 @@ 205.4 +$ \textbf{cd ../your-copy} 205.5 +$ \textbf{echo 'new contents' >> file} 205.6 +$ \textbf{hg commit -m 'Changed file'}
206.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 206.2 +++ b/en/examples/results/daily.copy.simple.out Mon Mar 09 21:37:47 2009 -0700 206.3 @@ -0,0 +1,4 @@ 206.4 +$ \textbf{mkdir k} 206.5 +$ \textbf{hg copy a k} 206.6 +$ \textbf{ls k} 206.7 +a
207.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 207.2 +++ b/en/examples/results/daily.copy.status-copy.out Mon Mar 09 21:37:47 2009 -0700 207.3 @@ -0,0 +1,4 @@ 207.4 +$ \textbf{hg status -C} 207.5 +A new-file 207.6 + file 207.7 +$ \textbf{hg commit -m 'Copied file'}
208.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 208.2 +++ b/en/examples/results/daily.copy.status.out Mon Mar 09 21:37:47 2009 -0700 208.3 @@ -0,0 +1,2 @@ 208.4 +$ \textbf{hg status} 208.5 +A new-file
209.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 209.2 +++ b/en/examples/results/daily.files.add-dir.out Mon Mar 09 21:37:47 2009 -0700 209.3 @@ -0,0 +1,10 @@ 209.4 +$ \textbf{mkdir b} 209.5 +$ \textbf{echo b > b/b} 209.6 +$ \textbf{echo c > b/c} 209.7 +$ \textbf{mkdir b/d} 209.8 +$ \textbf{echo d > b/d/d} 209.9 +$ \textbf{hg add b} 209.10 +adding b/b 209.11 +adding b/c 209.12 +adding b/d/d 209.13 +$ \textbf{hg commit -m 'Added all files in subdirectory'}
210.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 210.2 +++ b/en/examples/results/daily.files.add.out Mon Mar 09 21:37:47 2009 -0700 210.3 @@ -0,0 +1,10 @@ 210.4 +$ \textbf{hg init add-example} 210.5 +$ \textbf{cd add-example} 210.6 +$ \textbf{echo a > a} 210.7 +$ \textbf{hg status} 210.8 +? a 210.9 +$ \textbf{hg add a} 210.10 +$ \textbf{hg status} 210.11 +A a 210.12 +$ \textbf{hg commit -m 'Added one file'} 210.13 +$ \textbf{hg status}
211.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 211.2 +++ b/en/examples/results/daily.files.addremove.out Mon Mar 09 21:37:47 2009 -0700 211.3 @@ -0,0 +1,7 @@ 211.4 +$ \textbf{hg init addremove-example} 211.5 +$ \textbf{cd addremove-example} 211.6 +$ \textbf{echo a > a} 211.7 +$ \textbf{echo b > b} 211.8 +$ \textbf{hg addremove} 211.9 +adding a 211.10 +adding b
212.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 212.2 +++ b/en/examples/results/daily.files.commit-addremove.out Mon Mar 09 21:37:47 2009 -0700 212.3 @@ -0,0 +1,3 @@ 212.4 +$ \textbf{echo c > c} 212.5 +$ \textbf{hg commit -A -m 'Commit with addremove'} 212.6 +adding c
213.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 213.2 +++ b/en/examples/results/daily.files.hidden.out Mon Mar 09 21:37:47 2009 -0700 213.3 @@ -0,0 +1,14 @@ 213.4 +$ \textbf{hg init hidden-example} 213.5 +$ \textbf{cd hidden-example} 213.6 +$ \textbf{mkdir empty} 213.7 +$ \textbf{touch empty/.hidden} 213.8 +$ \textbf{hg add empty/.hidden} 213.9 +$ \textbf{hg commit -m 'Manage an empty-looking directory'} 213.10 +$ \textbf{ls empty} 213.11 +$ \textbf{cd ..} 213.12 +$ \textbf{hg clone hidden-example tmp} 213.13 +updating working directory 213.14 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 213.15 +$ \textbf{ls tmp} 213.16 +empty 213.17 +$ \textbf{ls tmp/empty}
214.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 214.2 +++ b/en/examples/results/daily.files.missing.out Mon Mar 09 21:37:47 2009 -0700 214.3 @@ -0,0 +1,8 @@ 214.4 +$ \textbf{hg init missing-example} 214.5 +$ \textbf{cd missing-example} 214.6 +$ \textbf{echo a > a} 214.7 +$ \textbf{hg add a} 214.8 +$ \textbf{hg commit -m 'File about to be missing'} 214.9 +$ \textbf{rm a} 214.10 +$ \textbf{hg status} 214.11 +! a
215.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 215.2 +++ b/en/examples/results/daily.files.recover-missing.out Mon Mar 09 21:37:47 2009 -0700 215.3 @@ -0,0 +1,4 @@ 215.4 +$ \textbf{hg revert a} 215.5 +$ \textbf{cat a} 215.6 +a 215.7 +$ \textbf{hg status}
216.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 216.2 +++ b/en/examples/results/daily.files.remove-after.out Mon Mar 09 21:37:47 2009 -0700 216.3 @@ -0,0 +1,3 @@ 216.4 +$ \textbf{hg remove --after a} 216.5 +$ \textbf{hg status} 216.6 +R a
217.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 217.2 +++ b/en/examples/results/daily.files.remove.out Mon Mar 09 21:37:47 2009 -0700 217.3 @@ -0,0 +1,13 @@ 217.4 +$ \textbf{hg init remove-example} 217.5 +$ \textbf{cd remove-example} 217.6 +$ \textbf{echo a > a} 217.7 +$ \textbf{mkdir b} 217.8 +$ \textbf{echo b > b/b} 217.9 +$ \textbf{hg add a b} 217.10 +adding b/b 217.11 +$ \textbf{hg commit -m 'Small example for file removal'} 217.12 +$ \textbf{hg remove a} 217.13 +$ \textbf{hg status} 217.14 +R a 217.15 +$ \textbf{hg remove b} 217.16 +removing b/b
218.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 218.2 +++ b/en/examples/results/daily.rename.rename.out Mon Mar 09 21:37:47 2009 -0700 218.3 @@ -0,0 +1,1 @@ 218.4 +$ \textbf{hg rename a b}
219.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 219.2 +++ b/en/examples/results/daily.rename.status-copy.out Mon Mar 09 21:37:47 2009 -0700 219.3 @@ -0,0 +1,4 @@ 219.4 +$ \textbf{hg status -C} 219.5 +A b 219.6 + a 219.7 +R a
220.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 220.2 +++ b/en/examples/results/daily.rename.status.out Mon Mar 09 21:37:47 2009 -0700 220.3 @@ -0,0 +1,3 @@ 220.4 +$ \textbf{hg status} 220.5 +A b 220.6 +R a
221.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 221.2 +++ b/en/examples/results/daily.revert.add.out Mon Mar 09 21:37:47 2009 -0700 221.3 @@ -0,0 +1,7 @@ 221.4 +$ \textbf{echo oops > oops} 221.5 +$ \textbf{hg add oops} 221.6 +$ \textbf{hg status oops} 221.7 +A oops 221.8 +$ \textbf{hg revert oops} 221.9 +$ \textbf{hg status} 221.10 +? oops
222.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 222.2 +++ b/en/examples/results/daily.revert.copy.out Mon Mar 09 21:37:47 2009 -0700 222.3 @@ -0,0 +1,4 @@ 222.4 +$ \textbf{hg copy file new-file} 222.5 +$ \textbf{hg revert new-file} 222.6 +$ \textbf{hg status} 222.7 +? new-file
223.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 223.2 +++ b/en/examples/results/daily.revert.missing.out Mon Mar 09 21:37:47 2009 -0700 223.3 @@ -0,0 +1,6 @@ 223.4 +$ \textbf{rm file} 223.5 +$ \textbf{hg status} 223.6 +! file 223.7 +$ \textbf{hg revert file} 223.8 +$ \textbf{ls file} 223.9 +file
224.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 224.2 +++ b/en/examples/results/daily.revert.modify.out Mon Mar 09 21:37:47 2009 -0700 224.3 @@ -0,0 +1,10 @@ 224.4 +$ \textbf{cat file} 224.5 +original content 224.6 +$ \textbf{echo unwanted change >> file} 224.7 +$ \textbf{hg diff file} 224.8 +diff -r file 224.9 + 224.10 + 224.11 +@@ -1,1 +1,2 @@ 224.12 + original content 224.13 ++unwanted change
225.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 225.2 +++ b/en/examples/results/daily.revert.remove.out Mon Mar 09 21:37:47 2009 -0700 225.3 @@ -0,0 +1,7 @@ 225.4 +$ \textbf{hg remove file} 225.5 +$ \textbf{hg status} 225.6 +R file 225.7 +$ \textbf{hg revert file} 225.8 +$ \textbf{hg status} 225.9 +$ \textbf{ls file} 225.10 +file
226.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 226.2 +++ b/en/examples/results/daily.revert.rename-orig.out Mon Mar 09 21:37:47 2009 -0700 226.3 @@ -0,0 +1,4 @@ 226.4 +$ \textbf{hg revert file} 226.5 +no changes needed to file 226.6 +$ \textbf{hg status} 226.7 +? new-file
227.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 227.2 +++ b/en/examples/results/daily.revert.rename.out Mon Mar 09 21:37:47 2009 -0700 227.3 @@ -0,0 +1,4 @@ 227.4 +$ \textbf{hg rename file new-file} 227.5 +$ \textbf{hg revert new-file} 227.6 +$ \textbf{hg status} 227.7 +? new-file
228.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 228.2 +++ b/en/examples/results/daily.revert.status.out Mon Mar 09 21:37:47 2009 -0700 228.3 @@ -0,0 +1,5 @@ 228.4 +$ \textbf{hg status} 228.5 +? file.orig 228.6 +$ \textbf{cat file.orig} 228.7 +original content 228.8 +unwanted change
229.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 229.2 +++ b/en/examples/results/daily.revert.unmodify.out Mon Mar 09 21:37:47 2009 -0700 229.3 @@ -0,0 +1,5 @@ 229.4 +$ \textbf{hg status} 229.5 +M file 229.6 +$ \textbf{hg revert file} 229.7 +$ \textbf{cat file} 229.8 +original content
230.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 230.2 +++ b/en/examples/results/extdiff.diff.out Mon Mar 09 21:37:47 2009 -0700 230.3 @@ -0,0 +1,7 @@ 230.4 +$ \textbf{hg diff} 230.5 +diff -r myfile 230.6 + 230.7 + 230.8 +@@ -1,1 +1,2 @@ 230.9 + The first line. 230.10 ++The second line.
231.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 231.2 +++ b/en/examples/results/extdiff.extdiff-ctx.out Mon Mar 09 21:37:47 2009 -0700 231.3 @@ -0,0 +1,8 @@ 231.4 +$ \textbf{hg extdiff -o -NprcC5} 231.5 + 231.6 + 231.7 +*************** 231.8 +*** 1 **** 231.9 + 231.10 + The first line. 231.11 ++ The second line.
232.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 232.2 +++ b/en/examples/results/extdiff.extdiff.out Mon Mar 09 21:37:47 2009 -0700 232.3 @@ -0,0 +1,6 @@ 232.4 +$ \textbf{hg extdiff} 232.5 + 232.6 + 232.7 +@@ -1 +1,2 @@ 232.8 + The first line. 232.9 ++The second line.
233.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 233.2 +++ b/en/examples/results/filenames.dirs.out Mon Mar 09 21:37:47 2009 -0700 233.3 @@ -0,0 +1,5 @@ 233.4 +$ \textbf{hg status src} 233.5 +? src/main.py 233.6 +? src/watcher/_watcher.c 233.7 +? src/watcher/watcher.py 233.8 +? src/xyzzy.txt
234.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 234.2 +++ b/en/examples/results/filenames.files.out Mon Mar 09 21:37:47 2009 -0700 234.3 @@ -0,0 +1,1 @@ 234.4 +$ \textbf{hg add COPYING README examples/simple.py}
235.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 235.2 +++ b/en/examples/results/filenames.filter.exclude.out Mon Mar 09 21:37:47 2009 -0700 235.3 @@ -0,0 +1,3 @@ 235.4 +$ \textbf{hg status -X '**.py' src} 235.5 +? src/watcher/_watcher.c 235.6 +? src/xyzzy.txt
236.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 236.2 +++ b/en/examples/results/filenames.filter.include.out Mon Mar 09 21:37:47 2009 -0700 236.3 @@ -0,0 +1,2 @@ 236.4 +$ \textbf{hg status -I '*.in'} 236.5 +? MANIFEST.in
237.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 237.2 +++ b/en/examples/results/filenames.glob.group.out Mon Mar 09 21:37:47 2009 -0700 237.3 @@ -0,0 +1,3 @@ 237.4 +$ \textbf{hg status 'glob:*.\{in,py\}'} 237.5 +? MANIFEST.in 237.6 +? setup.py
238.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 238.2 +++ b/en/examples/results/filenames.glob.question.out Mon Mar 09 21:37:47 2009 -0700 238.3 @@ -0,0 +1,2 @@ 238.4 +$ \textbf{hg status 'glob:**.?'} 238.5 +? src/watcher/_watcher.c
239.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 239.2 +++ b/en/examples/results/filenames.glob.range.out Mon Mar 09 21:37:47 2009 -0700 239.3 @@ -0,0 +1,3 @@ 239.4 +$ \textbf{hg status 'glob:**[nr-t]'} 239.5 +? MANIFEST.in 239.6 +? src/xyzzy.txt
240.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 240.2 +++ b/en/examples/results/filenames.glob.star-starstar.out Mon Mar 09 21:37:47 2009 -0700 240.3 @@ -0,0 +1,8 @@ 240.4 +$ \textbf{hg status 'glob:*.py'} 240.5 +? setup.py 240.6 +$ \textbf{hg status 'glob:**.py'} 240.7 +A examples/simple.py 240.8 +A src/main.py 240.9 +? examples/performant.py 240.10 +? setup.py 240.11 +? src/watcher/watcher.py
241.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 241.2 +++ b/en/examples/results/filenames.glob.star.out Mon Mar 09 21:37:47 2009 -0700 241.3 @@ -0,0 +1,2 @@ 241.4 +$ \textbf{hg add 'glob:*.py'} 241.5 +adding main.py
242.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 242.2 +++ b/en/examples/results/filenames.glob.starstar.out Mon Mar 09 21:37:47 2009 -0700 242.3 @@ -0,0 +1,7 @@ 242.4 +$ \textbf{cd ..} 242.5 +$ \textbf{hg status 'glob:**.py'} 242.6 +A examples/simple.py 242.7 +A src/main.py 242.8 +? examples/performant.py 242.9 +? setup.py 242.10 +? src/watcher/watcher.py
243.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 243.2 +++ b/en/examples/results/filenames.wdir-relname.out Mon Mar 09 21:37:47 2009 -0700 243.3 @@ -0,0 +1,22 @@ 243.4 +$ \textbf{hg status} 243.5 +A COPYING 243.6 +A README 243.7 +A examples/simple.py 243.8 +? MANIFEST.in 243.9 +? examples/performant.py 243.10 +? setup.py 243.11 +? src/main.py 243.12 +? src/watcher/_watcher.c 243.13 +? src/watcher/watcher.py 243.14 +? src/xyzzy.txt 243.15 +$ \textbf{hg status `hg root`} 243.16 +A ../COPYING 243.17 +A ../README 243.18 +A ../examples/simple.py 243.19 +? ../MANIFEST.in 243.20 +? ../examples/performant.py 243.21 +? ../setup.py 243.22 +? main.py 243.23 +? watcher/_watcher.c 243.24 +? watcher/watcher.py 243.25 +? xyzzy.txt
244.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 244.2 +++ b/en/examples/results/filenames.wdir-subdir.out Mon Mar 09 21:37:47 2009 -0700 244.3 @@ -0,0 +1,14 @@ 244.4 +$ \textbf{cd src} 244.5 +$ \textbf{hg add -n} 244.6 +adding ../MANIFEST.in 244.7 +adding ../examples/performant.py 244.8 +adding ../setup.py 244.9 +adding main.py 244.10 +adding watcher/_watcher.c 244.11 +adding watcher/watcher.py 244.12 +adding xyzzy.txt 244.13 +$ \textbf{hg add -n .} 244.14 +adding main.py 244.15 +adding watcher/_watcher.c 244.16 +adding watcher/watcher.py 244.17 +adding xyzzy.txt
245.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 245.2 +++ b/en/examples/results/hook.msglen.go.out Mon Mar 09 21:37:47 2009 -0700 245.3 @@ -0,0 +1,10 @@ 245.4 +$ \textbf{cat .hg/hgrc} 245.5 +[hooks] 245.6 +pretxncommit.msglen = test `hg tip --template \{desc\} | wc -c` -ge 10 245.7 +$ \textbf{echo a > a} 245.8 +$ \textbf{hg add a} 245.9 +$ \textbf{hg commit -A -m 'too short'} 245.10 +transaction abort! 245.11 +rollback completed 245.12 +abort: pretxncommit.msglen hook exited with status 1 245.13 +$ \textbf{hg commit -A -m 'long enough'}
246.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 246.2 +++ b/en/examples/results/hook.msglen.run.out Mon Mar 09 21:37:47 2009 -0700 246.3 @@ -0,0 +1,10 @@ 246.4 +$ \textbf{cat .hg/hgrc} 246.5 +[hooks] 246.6 +pretxncommit.msglen = test `hg tip --template \{desc\} | wc -c` -ge 10 246.7 +$ \textbf{echo a > a} 246.8 +$ \textbf{hg add a} 246.9 +$ \textbf{hg commit -A -m 'too short'} 246.10 +abort: pretxncommit.msglen hook exited with status 1 246.11 +transaction abort! 246.12 +rollback completed 246.13 +$ \textbf{hg commit -A -m 'long enough'}
247.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 247.2 +++ b/en/examples/results/hook.simple.ext.out Mon Mar 09 21:37:47 2009 -0700 247.3 @@ -0,0 +1,5 @@ 247.4 +$ \textbf{echo 'commit.when = echo -n "date of commit: "; date' >> .hg/hgrc} 247.5 +$ \textbf{echo a >> a} 247.6 +$ \textbf{hg commit -m 'i have two hooks'} 247.7 +committed 247.8 +
248.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 248.2 +++ b/en/examples/results/hook.simple.init.out Mon Mar 09 21:37:47 2009 -0700 248.3 @@ -0,0 +1,11 @@ 248.4 +$ \textbf{hg init hook-test} 248.5 +$ \textbf{cd hook-test} 248.6 +$ \textbf{echo '[hooks]' >> .hg/hgrc} 248.7 +$ \textbf{echo 'commit = echo committed $HG_NODE' >> .hg/hgrc} 248.8 +$ \textbf{cat .hg/hgrc} 248.9 +[hooks] 248.10 +commit = echo committed $HG_NODE 248.11 +$ \textbf{echo a > a} 248.12 +$ \textbf{hg add a} 248.13 +$ \textbf{hg commit -m 'testing commit hook'} 248.14 +committed
249.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 249.2 +++ b/en/examples/results/hook.simple.pretxncommit.out Mon Mar 09 21:37:47 2009 -0700 249.3 @@ -0,0 +1,13 @@ 249.4 +$ \textbf{cat check_bug_id} 249.5 +#!/bin/sh 249.6 +# check that a commit comment mentions a numeric bug id 249.7 +hg log -r $1 --template \{desc\} | grep -q "\textbackslash{}<bug *[0-9]" 249.8 +$ \textbf{echo 'pretxncommit.bug_id_required = ./check_bug_id $HG_NODE' >> .hg/hgrc} 249.9 +$ \textbf{echo a >> a} 249.10 +$ \textbf{hg commit -m 'i am not mentioning a bug id'} 249.11 +transaction abort! 249.12 +rollback completed 249.13 +abort: pretxncommit.bug_id_required hook exited with status 1 249.14 +$ \textbf{hg commit -m 'i refer you to bug 666'} 249.15 +committed 249.16 +
250.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 250.2 +++ b/en/examples/results/hook.ws.better.out Mon Mar 09 21:37:47 2009 -0700 250.3 @@ -0,0 +1,17 @@ 250.4 +$ \textbf{cat .hg/hgrc} 250.5 +[hooks] 250.6 +pretxncommit.whitespace = .hg/check_whitespace.py 250.7 +$ \textbf{echo 'a ' >> a} 250.8 +$ \textbf{hg commit -A -m 'add new line with trailing whitespace'} 250.9 +a, line 2: trailing whitespace added 250.10 +commit message saved to .hg/commit.save 250.11 +transaction abort! 250.12 +rollback completed 250.13 +abort: pretxncommit.whitespace hook exited with status 1 250.14 +$ \textbf{sed -i 's, *$,,' a} 250.15 +$ \textbf{hg commit -A -m 'trimmed trailing whitespace'} 250.16 +a, line 2: trailing whitespace added 250.17 +commit message saved to .hg/commit.save 250.18 +transaction abort! 250.19 +rollback completed 250.20 +abort: pretxncommit.whitespace hook exited with status 1
251.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 251.2 +++ b/en/examples/results/hook.ws.simple.out Mon Mar 09 21:37:47 2009 -0700 251.3 @@ -0,0 +1,11 @@ 251.4 +$ \textbf{cat .hg/hgrc} 251.5 +[hooks] 251.6 +pretxncommit.whitespace = hg export tip | (! egrep -q '^\textbackslash{}+.*[ \textbackslash{}t]$') 251.7 +$ \textbf{echo 'a ' > a} 251.8 +$ \textbf{hg commit -A -m 'test with trailing whitespace'} 251.9 +adding a 251.10 +transaction abort! 251.11 +rollback completed 251.12 +abort: pretxncommit.whitespace hook exited with status 1 251.13 +$ \textbf{echo 'a' > a} 251.14 +$ \textbf{hg commit -A -m 'drop trailing whitespace and try again'}
252.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 252.2 +++ b/en/examples/results/issue29.go.out Mon Mar 09 21:37:47 2009 -0700 252.3 @@ -0,0 +1,17 @@ 252.4 +$ \textbf{hg init issue29} 252.5 +$ \textbf{cd issue29} 252.6 +$ \textbf{echo a > a} 252.7 +$ \textbf{hg ci -Ama} 252.8 +adding a 252.9 +$ \textbf{echo b > b} 252.10 +$ \textbf{hg ci -Amb} 252.11 +adding b 252.12 +$ \textbf{hg up 0} 252.13 +0 files updated, 0 files merged, 1 files removed, 0 files unresolved 252.14 +$ \textbf{mkdir b} 252.15 +$ \textbf{echo b > b/b} 252.16 +$ \textbf{hg ci -Amc} 252.17 +adding b/b 252.18 +created new head 252.19 +$ \textbf{hg merge} 252.20 +
253.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 253.2 +++ b/en/examples/results/mq.dodiff.diff.out Mon Mar 09 21:37:47 2009 -0700 253.3 @@ -0,0 +1,13 @@ 253.4 +$ \textbf{echo 'this is my original thought' > oldfile} 253.5 +$ \textbf{echo 'i have changed my mind' > newfile} 253.6 +$ \textbf{diff -u oldfile newfile > tiny.patch} 253.7 +$ \textbf{cat tiny.patch} 253.8 + 253.9 + 253.10 +@@ -1 +1 @@ 253.11 +-this is my original thought 253.12 ++i have changed my mind 253.13 +$ \textbf{patch < tiny.patch} 253.14 +patching file oldfile 253.15 +$ \textbf{cat oldfile} 253.16 +i have changed my mind
254.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 254.2 +++ b/en/examples/results/mq.guards.init.out Mon Mar 09 21:37:47 2009 -0700 254.3 @@ -0,0 +1,9 @@ 254.4 +$ \textbf{hg qinit} 254.5 +$ \textbf{hg qnew hello.patch} 254.6 +$ \textbf{echo hello > hello} 254.7 +$ \textbf{hg add hello} 254.8 +$ \textbf{hg qrefresh} 254.9 +$ \textbf{hg qnew goodbye.patch} 254.10 +$ \textbf{echo goodbye > goodbye} 254.11 +$ \textbf{hg add goodbye} 254.12 +$ \textbf{hg qrefresh}
255.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 255.2 +++ b/en/examples/results/mq.guards.qguard.neg.out Mon Mar 09 21:37:47 2009 -0700 255.3 @@ -0,0 +1,3 @@ 255.4 +$ \textbf{hg qguard hello.patch -quux} 255.5 +$ \textbf{hg qguard hello.patch} 255.6 +hello.patch: -quux
256.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 256.2 +++ b/en/examples/results/mq.guards.qguard.out Mon Mar 09 21:37:47 2009 -0700 256.3 @@ -0,0 +1,2 @@ 256.4 +$ \textbf{hg qguard} 256.5 +goodbye.patch: unguarded
257.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 257.2 +++ b/en/examples/results/mq.guards.qguard.pos.out Mon Mar 09 21:37:47 2009 -0700 257.3 @@ -0,0 +1,3 @@ 257.4 +$ \textbf{hg qguard +foo} 257.5 +$ \textbf{hg qguard} 257.6 +goodbye.patch: +foo
258.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 258.2 +++ b/en/examples/results/mq.guards.qselect.cat.out Mon Mar 09 21:37:47 2009 -0700 258.3 @@ -0,0 +1,2 @@ 258.4 +$ \textbf{cat .hg/patches/guards} 258.5 +foo
259.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 259.2 +++ b/en/examples/results/mq.guards.qselect.error.out Mon Mar 09 21:37:47 2009 -0700 259.3 @@ -0,0 +1,2 @@ 259.4 +$ \textbf{hg qselect +foo} 259.5 +abort: guard '+foo' starts with invalid character: '+'
260.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 260.2 +++ b/en/examples/results/mq.guards.qselect.foo.out Mon Mar 09 21:37:47 2009 -0700 260.3 @@ -0,0 +1,8 @@ 260.4 +$ \textbf{hg qpop -a} 260.5 +patch queue now empty 260.6 +$ \textbf{hg qselect} 260.7 +no active guards 260.8 +$ \textbf{hg qselect foo} 260.9 +number of unguarded, unapplied patches has changed from 1 to 2 260.10 +$ \textbf{hg qselect} 260.11 +foo
261.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 261.2 +++ b/en/examples/results/mq.guards.qselect.foobar.out Mon Mar 09 21:37:47 2009 -0700 261.3 @@ -0,0 +1,8 @@ 261.4 +$ \textbf{hg qselect foo bar} 261.5 +number of unguarded, unapplied patches has changed from 0 to 2 261.6 +$ \textbf{hg qpop -a} 261.7 +no patches applied 261.8 +$ \textbf{hg qpush -a} 261.9 +applying hello.patch 261.10 +applying goodbye.patch 261.11 +now at: goodbye.patch
262.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 262.2 +++ b/en/examples/results/mq.guards.qselect.qpush.out Mon Mar 09 21:37:47 2009 -0700 262.3 @@ -0,0 +1,4 @@ 262.4 +$ \textbf{hg qpush -a} 262.5 +applying hello.patch 262.6 +applying goodbye.patch 262.7 +now at: goodbye.patch
263.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 263.2 +++ b/en/examples/results/mq.guards.qselect.quux.out Mon Mar 09 21:37:47 2009 -0700 263.3 @@ -0,0 +1,6 @@ 263.4 +$ \textbf{hg qselect quux} 263.5 +number of guarded, applied patches has changed from 0 to 2 263.6 +$ \textbf{hg qpop -a} 263.7 +patch queue now empty 263.8 +$ \textbf{hg qpush -a} 263.9 +patch series already fully applied
264.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 264.2 +++ b/en/examples/results/mq.guards.series.out Mon Mar 09 21:37:47 2009 -0700 264.3 @@ -0,0 +1,3 @@ 264.4 +$ \textbf{cat .hg/patches/series} 264.5 +hello.patch #-quux 264.6 +goodbye.patch #+foo
265.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 265.2 +++ b/en/examples/results/mq.id.out.out Mon Mar 09 21:37:47 2009 -0700 265.3 @@ -0,0 +1,32 @@ 265.4 +$ \textbf{hg qapplied} 265.5 +first.patch 265.6 +second.patch 265.7 +$ \textbf{hg log -r qbase:qtip} 265.8 +changeset: 265.9 +tag: first.patch 265.10 +tag: qbase 265.11 +user: Bryan O'Sullivan <bos@serpentine.com> 265.12 + 265.13 +summary: patch queue: first.patch 265.14 + 265.15 +changeset: 265.16 +tag: second.patch 265.17 +tag: qtip 265.18 +tag: tip 265.19 +user: Bryan O'Sullivan <bos@serpentine.com> 265.20 + 265.21 +summary: patch queue: second.patch 265.22 + 265.23 +$ \textbf{hg export second.patch} 265.24 +# HG changeset patch 265.25 +# User Bryan O'Sullivan <bos@serpentine.com> 265.26 + 265.27 +# Node ID 265.28 +# Parent 265.29 +patch queue: second.patch 265.30 + 265.31 +diff -r -r other.c 265.32 + 265.33 + 265.34 +@@ -0,0 +1,1 @@ 265.35 ++double u;
266.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 266.2 +++ b/en/examples/results/mq.id.output.out Mon Mar 09 21:37:47 2009 -0700 266.3 @@ -0,0 +1,32 @@ 266.4 +$ \textbf{hg qapplied} 266.5 +first.patch 266.6 +second.patch 266.7 +$ \textbf{hg log -r qbase:qtip} 266.8 +changeset: 266.9 +tag: first.patch 266.10 +tag: qbase 266.11 +user: Bryan O'Sullivan <bos@serpentine.com> 266.12 + 266.13 +summary: [mq]: first.patch 266.14 + 266.15 +changeset: 266.16 +tag: qtip 266.17 +tag: second.patch 266.18 +tag: tip 266.19 +user: Bryan O'Sullivan <bos@serpentine.com> 266.20 + 266.21 +summary: [mq]: second.patch 266.22 + 266.23 +$ \textbf{hg export second.patch} 266.24 +# HG changeset patch 266.25 +# User Bryan O'Sullivan <bos@serpentine.com> 266.26 + 266.27 +# Node ID 266.28 +# Parent 266.29 +[mq]: second.patch 266.30 + 266.31 +diff -r -r other.c 266.32 + 266.33 + 266.34 +@@ -0,0 +1,1 @@ 266.35 ++double u;
267.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 267.2 +++ b/en/examples/results/mq.qinit-help.help.out Mon Mar 09 21:37:47 2009 -0700 267.3 @@ -0,0 +1,16 @@ 267.4 +$ \textbf{hg help qinit} 267.5 +hg qinit [-c] 267.6 + 267.7 +init a new queue repository 267.8 + 267.9 + The queue repository is unversioned by default. If -c is 267.10 + specified, qinit will create a separate nested repository 267.11 + for patches (qinit -c may also be run later to convert 267.12 + an unversioned patch repository into a versioned one). 267.13 + You can use qcommit to commit changes to this queue repository. 267.14 + 267.15 +options: 267.16 + 267.17 + -c --create-repo create queue repository 267.18 + 267.19 +use "hg -v help qinit" to show global options
268.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 268.2 +++ b/en/examples/results/mq.tarball.download.out Mon Mar 09 21:37:47 2009 -0700 268.3 @@ -0,0 +1,9 @@ 268.4 +$ \textbf{download netplug-1.2.5.tar.bz2} 268.5 +$ \textbf{tar jxf netplug-1.2.5.tar.bz2} 268.6 +$ \textbf{cd netplug-1.2.5} 268.7 +$ \textbf{hg init} 268.8 +$ \textbf{hg commit -q --addremove --message netplug-1.2.5} 268.9 +$ \textbf{cd ..} 268.10 +$ \textbf{hg clone netplug-1.2.5 netplug} 268.11 +updating working directory 268.12 +18 files updated, 0 files merged, 0 files removed, 0 files unresolved
269.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 269.2 +++ b/en/examples/results/mq.tarball.newsource.out Mon Mar 09 21:37:47 2009 -0700 269.3 @@ -0,0 +1,13 @@ 269.4 +$ \textbf{hg qpop -a} 269.5 +patch queue now empty 269.6 +$ \textbf{cd ..} 269.7 +$ \textbf{download netplug-1.2.8.tar.bz2} 269.8 +$ \textbf{hg clone netplug-1.2.5 netplug-1.2.8} 269.9 +updating working directory 269.10 +18 files updated, 0 files merged, 0 files removed, 0 files unresolved 269.11 +$ \textbf{cd netplug-1.2.8} 269.12 +$ \textbf{hg locate -0 | xargs -0 rm} 269.13 +$ \textbf{cd ..} 269.14 +$ \textbf{tar jxf netplug-1.2.8.tar.bz2} 269.15 +$ \textbf{cd netplug-1.2.8} 269.16 +$ \textbf{hg commit --addremove --message netplug-1.2.8}
270.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 270.2 +++ b/en/examples/results/mq.tarball.qinit.out Mon Mar 09 21:37:47 2009 -0700 270.3 @@ -0,0 +1,28 @@ 270.4 +$ \textbf{cd netplug} 270.5 +$ \textbf{hg qinit} 270.6 +$ \textbf{hg qnew -m 'fix build problem with gcc 4' build-fix.patch} 270.7 +$ \textbf{perl -pi -e 's/int addr_len/socklen_t addr_len/' netlink.c} 270.8 +$ \textbf{hg qrefresh} 270.9 +$ \textbf{hg tip -p} 270.10 +changeset: 270.11 +tag: qtip 270.12 +tag: build-fix.patch 270.13 +tag: tip 270.14 +tag: qbase 270.15 +user: Bryan O'Sullivan <bos@serpentine.com> 270.16 + 270.17 +summary: fix build problem with gcc 4 270.18 + 270.19 +diff -r -r netlink.c 270.20 + 270.21 + 270.22 +@@ -275,7 +275,7 @@ 270.23 + exit(1); 270.24 + \} 270.25 + 270.26 +- int addr_len = sizeof(addr); 270.27 ++ socklen_t addr_len = sizeof(addr); 270.28 + 270.29 + if (getsockname(fd, (struct sockaddr *) &addr, &addr_len) == -1) \{ 270.30 + do_log(LOG_ERR, "Could not get socket details: %m"); 270.31 +
271.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 271.2 +++ b/en/examples/results/mq.tarball.repush.out Mon Mar 09 21:37:47 2009 -0700 271.3 @@ -0,0 +1,13 @@ 271.4 +$ \textbf{cd ../netplug} 271.5 +$ \textbf{hg pull ../netplug-1.2.8} 271.6 +pulling from ../netplug-1.2.8 271.7 +searching for changes 271.8 +adding changesets 271.9 +adding manifests 271.10 +adding file changes 271.11 +added 1 changesets with 12 changes to 12 files 271.12 +(run 'hg update' to get a working copy) 271.13 +$ \textbf{hg qpush -a} 271.14 +(working directory not at tip) 271.15 +applying build-fix.patch 271.16 +now at: build-fix.patch
272.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 272.2 +++ b/en/examples/results/mq.tools.lsdiff.out Mon Mar 09 21:37:47 2009 -0700 272.3 @@ -0,0 +1,21 @@ 272.4 +$ \textbf{lsdiff -nvv remove-redundant-null-checks.patch} 272.5 +22 File #1 a/drivers/char/agp/sgi-agp.c 272.6 + 24 Hunk #1 static int __devinit agp_sgi_init(void) 272.7 +37 File #2 a/drivers/char/hvcs.c 272.8 + 39 Hunk #1 static struct tty_operations hvcs_ops = 272.9 + 53 Hunk #2 static int hvcs_alloc_index_list(int n) 272.10 +69 File #3 a/drivers/message/fusion/mptfc.c 272.11 + 71 Hunk #1 mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, in 272.12 +85 File #4 a/drivers/message/fusion/mptsas.c 272.13 + 87 Hunk #1 mptsas_probe_hba_phys(MPT_ADAPTER *ioc) 272.14 +98 File #5 a/drivers/net/fs_enet/fs_enet-mii.c 272.15 + 100 Hunk #1 static struct fs_enet_mii_bus *create_bu 272.16 +111 File #6 a/drivers/net/wireless/ipw2200.c 272.17 + 113 Hunk #1 static struct ipw_fw_error *ipw_alloc_er 272.18 + 126 Hunk #2 static ssize_t clear_error(struct device 272.19 + 140 Hunk #3 static void ipw_irq_tasklet(struct ipw_p 272.20 + 150 Hunk #4 static void ipw_pci_remove(struct pci_de 272.21 +164 File #7 a/drivers/scsi/libata-scsi.c 272.22 + 166 Hunk #1 int ata_cmd_ioctl(struct scsi_device *sc 272.23 +178 File #8 a/drivers/video/au1100fb.c 272.24 + 180 Hunk #1 void __exit au1100fb_cleanup(void)
273.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 273.2 +++ b/en/examples/results/mq.tools.tools.out Mon Mar 09 21:37:47 2009 -0700 273.3 @@ -0,0 +1,23 @@ 273.4 +$ \textbf{diffstat -p1 remove-redundant-null-checks.patch} 273.5 + drivers/char/agp/sgi-agp.c | 5 ++--- 273.6 + drivers/char/hvcs.c | 11 +++++------ 273.7 + drivers/message/fusion/mptfc.c | 6 ++---- 273.8 + drivers/message/fusion/mptsas.c | 3 +-- 273.9 + drivers/net/fs_enet/fs_enet-mii.c | 3 +-- 273.10 + drivers/net/wireless/ipw2200.c | 22 ++++++---------------- 273.11 + drivers/scsi/libata-scsi.c | 4 +--- 273.12 + drivers/video/au1100fb.c | 3 +-- 273.13 + 8 files changed, 19 insertions(+), 38 deletions(-) 273.14 +$ \textbf{filterdiff -i '*/video/*' remove-redundant-null-checks.patch} 273.15 + 273.16 + 273.17 +@@ -743,8 +743,7 @@ void __exit au1100fb_cleanup(void) 273.18 + \{ 273.19 + driver_unregister(&au1100fb_driver); 273.20 + 273.21 +- if (drv_info.opt_mode) 273.22 +- kfree(drv_info.opt_mode); 273.23 ++ kfree(drv_info.opt_mode); 273.24 + \} 273.25 + 273.26 + module_init(au1100fb_init);
274.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 274.2 +++ b/en/examples/results/mq.tutorial.add.out Mon Mar 09 21:37:47 2009 -0700 274.3 @@ -0,0 +1,4 @@ 274.4 +$ \textbf{echo 'file 3, line 1' >> file3} 274.5 +$ \textbf{hg qnew add-file3.patch} 274.6 +$ \textbf{hg qnew -f add-file3.patch} 274.7 +abort: patch "add-file3.patch" already exists
275.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 275.2 +++ b/en/examples/results/mq.tutorial.qinit.out Mon Mar 09 21:37:47 2009 -0700 275.3 @@ -0,0 +1,7 @@ 275.4 +$ \textbf{hg init mq-sandbox} 275.5 +$ \textbf{cd mq-sandbox} 275.6 +$ \textbf{echo 'line 1' > file1} 275.7 +$ \textbf{echo 'another line 1' > file2} 275.8 +$ \textbf{hg add file1 file2} 275.9 +$ \textbf{hg commit -m'first change'} 275.10 +$ \textbf{hg qinit}
276.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 276.2 +++ b/en/examples/results/mq.tutorial.qnew.out Mon Mar 09 21:37:47 2009 -0700 276.3 @@ -0,0 +1,20 @@ 276.4 +$ \textbf{hg tip} 276.5 +changeset: 276.6 +tag: tip 276.7 +user: Bryan O'Sullivan <bos@serpentine.com> 276.8 + 276.9 +summary: first change 276.10 + 276.11 +$ \textbf{hg qnew first.patch} 276.12 +$ \textbf{hg tip} 276.13 +changeset: 276.14 +tag: qtip 276.15 +tag: first.patch 276.16 +tag: tip 276.17 +tag: qbase 276.18 +user: Bryan O'Sullivan <bos@serpentine.com> 276.19 + 276.20 +summary: [mq]: first.patch 276.21 + 276.22 +$ \textbf{ls .hg/patches} 276.23 +first.patch series status
277.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 277.2 +++ b/en/examples/results/mq.tutorial.qnew2.out Mon Mar 09 21:37:47 2009 -0700 277.3 @@ -0,0 +1,28 @@ 277.4 +$ \textbf{hg qnew second.patch} 277.5 +$ \textbf{hg log --style=compact --limit=2} 277.6 +2[qtip,second.patch,tip] 2009-01-30 06:34 +0000 bos 277.7 + [mq]: second.patch 277.8 + 277.9 +1[first.patch,qbase] 2009-01-30 06:34 +0000 bos 277.10 + [mq]: first.patch 277.11 + 277.12 +$ \textbf{echo 'line 4' >> file1} 277.13 +$ \textbf{hg qrefresh} 277.14 +$ \textbf{hg tip --style=compact --patch} 277.15 +2[qtip,second.patch,tip] 2009-01-30 06:34 +0000 bos 277.16 + [mq]: second.patch 277.17 + 277.18 +diff -r -r file1 277.19 + 277.20 + 277.21 +@@ -1,3 +1,4 @@ 277.22 + line 1 277.23 + line 2 277.24 + line 3 277.25 ++line 4 277.26 + 277.27 +$ \textbf{hg annotate file1} 277.28 +0: line 1 277.29 +1: line 2 277.30 +1: line 3 277.31 +2: line 4
278.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 278.2 +++ b/en/examples/results/mq.tutorial.qpop.out Mon Mar 09 21:37:47 2009 -0700 278.3 @@ -0,0 +1,14 @@ 278.4 +$ \textbf{hg qapplied} 278.5 +first.patch 278.6 +second.patch 278.7 +$ \textbf{hg qpop} 278.8 +now at: first.patch 278.9 +$ \textbf{hg qseries} 278.10 +first.patch 278.11 +second.patch 278.12 +$ \textbf{hg qapplied} 278.13 +first.patch 278.14 +$ \textbf{cat file1} 278.15 +line 1 278.16 +line 2 278.17 +line 3
279.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 279.2 +++ b/en/examples/results/mq.tutorial.qpush-a.out Mon Mar 09 21:37:47 2009 -0700 279.3 @@ -0,0 +1,8 @@ 279.4 +$ \textbf{hg qpush -a} 279.5 +applying second.patch 279.6 +now at: second.patch 279.7 +$ \textbf{cat file1} 279.8 +line 1 279.9 +line 2 279.10 +line 3 279.11 +line 4
280.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 280.2 +++ b/en/examples/results/mq.tutorial.qrefresh.out Mon Mar 09 21:37:47 2009 -0700 280.3 @@ -0,0 +1,21 @@ 280.4 +$ \textbf{echo 'line 2' >> file1} 280.5 +$ \textbf{hg diff} 280.6 +diff -r file1 280.7 + 280.8 + 280.9 +@@ -1,1 +1,2 @@ 280.10 + line 1 280.11 ++line 2 280.12 +$ \textbf{hg qrefresh} 280.13 +$ \textbf{hg diff} 280.14 +$ \textbf{hg tip --style=compact --patch} 280.15 +1[qtip,first.patch,tip,qbase] 2009-01-30 06:34 +0000 bos 280.16 + [mq]: first.patch 280.17 + 280.18 +diff -r -r file1 280.19 + 280.20 + 280.21 +@@ -1,1 +1,2 @@ 280.22 + line 1 280.23 ++line 2 280.24 +
281.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 281.2 +++ b/en/examples/results/mq.tutorial.qrefresh2.out Mon Mar 09 21:37:47 2009 -0700 281.3 @@ -0,0 +1,16 @@ 281.4 +$ \textbf{echo 'line 3' >> file1} 281.5 +$ \textbf{hg status} 281.6 +M file1 281.7 +$ \textbf{hg qrefresh} 281.8 +$ \textbf{hg tip --style=compact --patch} 281.9 +1[qtip,first.patch,tip,qbase] 2009-01-30 06:34 +0000 bos 281.10 + [mq]: first.patch 281.11 + 281.12 +diff -r -r file1 281.13 + 281.14 + 281.15 +@@ -1,1 +1,3 @@ 281.16 + line 1 281.17 ++line 2 281.18 ++line 3 281.19 +
282.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 282.2 +++ b/en/examples/results/mq.tutorial.qseries.out Mon Mar 09 21:37:47 2009 -0700 282.3 @@ -0,0 +1,6 @@ 282.4 +$ \textbf{hg qseries} 282.5 +first.patch 282.6 +second.patch 282.7 +$ \textbf{hg qapplied} 282.8 +first.patch 282.9 +second.patch
283.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 283.2 +++ b/en/examples/results/rename.divergent.clone.out Mon Mar 09 21:37:47 2009 -0700 283.3 @@ -0,0 +1,6 @@ 283.4 +$ \textbf{hg clone orig anne} 283.5 +updating working directory 283.6 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 283.7 +$ \textbf{hg clone orig bob} 283.8 +updating working directory 283.9 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved
284.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 284.2 +++ b/en/examples/results/rename.divergent.merge.out Mon Mar 09 21:37:47 2009 -0700 284.3 @@ -0,0 +1,26 @@ 284.4 +# See http://www.selenic.com/mercurial/bts/issue455 284.5 +$ \textbf{cd ../orig} 284.6 +$ \textbf{hg pull -u ../anne} 284.7 +pulling from ../anne 284.8 +searching for changes 284.9 +adding changesets 284.10 +adding manifests 284.11 +adding file changes 284.12 +added 1 changesets with 1 changes to 1 files 284.13 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved 284.14 +$ \textbf{hg pull ../bob} 284.15 +pulling from ../bob 284.16 +searching for changes 284.17 +adding changesets 284.18 +adding manifests 284.19 +adding file changes 284.20 +added 1 changesets with 1 changes to 1 files (+1 heads) 284.21 +(run 'hg heads' to see heads, 'hg merge' to merge) 284.22 +$ \textbf{hg merge} 284.23 +warning: detected divergent renames of foo to: 284.24 + bar 284.25 + quux 284.26 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 284.27 +(branch merge, don't forget to commit) 284.28 +$ \textbf{ls} 284.29 +bar quux
285.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 285.2 +++ b/en/examples/results/rename.divergent.rename.anne.out Mon Mar 09 21:37:47 2009 -0700 285.3 @@ -0,0 +1,3 @@ 285.4 +$ \textbf{cd anne} 285.5 +$ \textbf{hg mv foo bar} 285.6 +$ \textbf{hg ci -m 'Rename foo to bar'}
286.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 286.2 +++ b/en/examples/results/rename.divergent.rename.bob.out Mon Mar 09 21:37:47 2009 -0700 286.3 @@ -0,0 +1,3 @@ 286.4 +$ \textbf{cd ../bob} 286.5 +$ \textbf{hg mv foo quux} 286.6 +$ \textbf{hg ci -m 'Rename foo to quux'}
287.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 287.2 +++ b/en/examples/results/rollback.add.out Mon Mar 09 21:37:47 2009 -0700 287.3 @@ -0,0 +1,2 @@ 287.4 +$ \textbf{hg add b} 287.5 +$ \textbf{hg commit -m 'Add file b, this time for real'}
288.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 288.2 +++ b/en/examples/results/rollback.commit.out Mon Mar 09 21:37:47 2009 -0700 288.3 @@ -0,0 +1,4 @@ 288.4 +$ \textbf{hg status} 288.5 +M a 288.6 +$ \textbf{echo b > b} 288.7 +$ \textbf{hg commit -m 'Add file b'}
289.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 289.2 +++ b/en/examples/results/rollback.rollback.out Mon Mar 09 21:37:47 2009 -0700 289.3 @@ -0,0 +1,12 @@ 289.4 +$ \textbf{hg rollback} 289.5 +rolling back last transaction 289.6 +$ \textbf{hg tip} 289.7 +changeset: 289.8 +tag: tip 289.9 +user: Bryan O'Sullivan <bos@serpentine.com> 289.10 + 289.11 +summary: First commit 289.12 + 289.13 +$ \textbf{hg status} 289.14 +M a 289.15 +? b
290.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 290.2 +++ b/en/examples/results/rollback.status.out Mon Mar 09 21:37:47 2009 -0700 290.3 @@ -0,0 +1,9 @@ 290.4 +$ \textbf{hg status} 290.5 +? b 290.6 +$ \textbf{hg tip} 290.7 +changeset: 290.8 +tag: tip 290.9 +user: Bryan O'Sullivan <bos@serpentine.com> 290.10 + 290.11 +summary: Add file b 290.12 +
291.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 291.2 +++ b/en/examples/results/rollback.twice.out Mon Mar 09 21:37:47 2009 -0700 291.3 @@ -0,0 +1,4 @@ 291.4 +$ \textbf{hg rollback} 291.5 +rolling back last transaction 291.6 +$ \textbf{hg rollback} 291.7 +no rollback information available
292.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 292.2 +++ b/en/examples/results/tag.init.out Mon Mar 09 21:37:47 2009 -0700 292.3 @@ -0,0 +1,5 @@ 292.4 +$ \textbf{hg init mytag} 292.5 +$ \textbf{cd mytag} 292.6 +$ \textbf{echo hello > myfile} 292.7 +$ \textbf{hg commit -A -m 'Initial commit'} 292.8 +adding myfile
293.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 293.2 +++ b/en/examples/results/tag.log.out Mon Mar 09 21:37:47 2009 -0700 293.3 @@ -0,0 +1,13 @@ 293.4 +$ \textbf{hg log} 293.5 +changeset: 293.6 +tag: tip 293.7 +user: Bryan O'Sullivan <bos@serpentine.com> 293.8 + 293.9 +summary: Added tag v1.0 for changeset 293.10 + 293.11 +changeset: 293.12 +tag: v1.0 293.13 +user: Bryan O'Sullivan <bos@serpentine.com> 293.14 + 293.15 +summary: Initial commit 293.16 +
294.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 294.2 +++ b/en/examples/results/tag.log.v1.0.out Mon Mar 09 21:37:47 2009 -0700 294.3 @@ -0,0 +1,10 @@ 294.4 +$ \textbf{echo goodbye > myfile2} 294.5 +$ \textbf{hg commit -A -m 'Second commit'} 294.6 +adding myfile2 294.7 +$ \textbf{hg log -r v1.0} 294.8 +changeset: 294.9 +tag: v1.0 294.10 +user: Bryan O'Sullivan <bos@serpentine.com> 294.11 + 294.12 +summary: Initial commit 294.13 +
295.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 295.2 +++ b/en/examples/results/tag.remove.out Mon Mar 09 21:37:47 2009 -0700 295.3 @@ -0,0 +1,3 @@ 295.4 +$ \textbf{hg tag --remove v1.0} 295.5 +$ \textbf{hg tags} 295.6 +tip
296.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 296.2 +++ b/en/examples/results/tag.replace.out Mon Mar 09 21:37:47 2009 -0700 296.3 @@ -0,0 +1,10 @@ 296.4 +$ \textbf{hg tag -r 1 v1.1} 296.5 +$ \textbf{hg tags} 296.6 +tip 296.7 +v1.1 296.8 +$ \textbf{hg tag -r 2 v1.1} 296.9 +abort: tag 'v1.1' already exists (use -f to force) 296.10 +$ \textbf{hg tag -f -r 2 v1.1} 296.11 +$ \textbf{hg tags} 296.12 +tip 296.13 +v1.1
297.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 297.2 +++ b/en/examples/results/tag.tag.out Mon Mar 09 21:37:47 2009 -0700 297.3 @@ -0,0 +1,1 @@ 297.4 +$ \textbf{hg tag v1.0}
298.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 298.2 +++ b/en/examples/results/tag.tags.out Mon Mar 09 21:37:47 2009 -0700 298.3 @@ -0,0 +1,3 @@ 298.4 +$ \textbf{hg tags} 298.5 +tip 298.6 +v1.0
299.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 299.2 +++ b/en/examples/results/tag.tip.out Mon Mar 09 21:37:47 2009 -0700 299.3 @@ -0,0 +1,7 @@ 299.4 +$ \textbf{hg tip} 299.5 +changeset: 299.6 +tag: tip 299.7 +user: Bryan O'Sullivan <bos@serpentine.com> 299.8 + 299.9 +summary: Added tag v1.1 for changeset 299.10 +
300.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 300.2 +++ b/en/examples/results/template.simple.changelog.out Mon Mar 09 21:37:47 2009 -0700 300.3 @@ -0,0 +1,22 @@ 300.4 + 300.5 + 300.6 + 300.7 + 300.8 + 300.9 + 300.10 + 300.11 + 300.12 + 300.13 + 300.14 + 300.15 + 300.16 + 300.17 + 300.18 + 300.19 + 300.20 + 300.21 + 300.22 + 300.23 + 300.24 + 300.25 +
301.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 301.2 +++ b/en/examples/results/template.simple.combine.out Mon Mar 09 21:37:47 2009 -0700 301.3 @@ -0,0 +1,6 @@ 301.4 + 301.5 + 301.6 + 301.7 + 301.8 + 301.9 +
302.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 302.2 +++ b/en/examples/results/template.simple.compact.out Mon Mar 09 21:37:47 2009 -0700 302.3 @@ -0,0 +1,13 @@ 302.4 + 302.5 + 302.6 + 302.7 + 302.8 + 302.9 + 302.10 + 302.11 + 302.12 + 302.13 + 302.14 + 302.15 + 302.16 +
303.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 303.2 +++ b/en/examples/results/template.simple.datekeyword.out Mon Mar 09 21:37:47 2009 -0700 303.3 @@ -0,0 +1,4 @@ 303.4 + 303.5 + 303.6 + 303.7 +
304.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 304.2 +++ b/en/examples/results/template.simple.keywords.out Mon Mar 09 21:37:47 2009 -0700 304.3 @@ -0,0 +1,21 @@ 304.4 + 304.5 + 304.6 + 304.7 + 304.8 + 304.9 + 304.10 + 304.11 + 304.12 + 304.13 + 304.14 + 304.15 + 304.16 + 304.17 + 304.18 + 304.19 + 304.20 + 304.21 + 304.22 + 304.23 + 304.24 +
305.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 305.2 +++ b/en/examples/results/template.simple.manyfilters.out Mon Mar 09 21:37:47 2009 -0700 305.3 @@ -0,0 +1,62 @@ 305.4 + 305.5 + 305.6 + 305.7 + 305.8 + 305.9 + 305.10 + 305.11 + 305.12 + 305.13 + 305.14 + 305.15 + 305.16 + 305.17 + 305.18 + 305.19 + 305.20 + 305.21 + 305.22 + 305.23 + 305.24 + 305.25 + 305.26 + 305.27 + 305.28 + 305.29 + 305.30 + 305.31 + 305.32 + 305.33 + 305.34 + 305.35 + 305.36 + 305.37 + 305.38 + 305.39 + 305.40 + 305.41 + 305.42 + 305.43 + 305.44 + 305.45 + 305.46 + 305.47 + 305.48 + 305.49 + 305.50 + 305.51 + 305.52 + 305.53 + 305.54 + 305.55 + 305.56 + 305.57 + 305.58 + 305.59 + 305.60 + 305.61 + 305.62 + 305.63 + 305.64 + 305.65 +
306.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 306.2 +++ b/en/examples/results/template.simple.normal.out Mon Mar 09 21:37:47 2009 -0700 306.3 @@ -0,0 +1,7 @@ 306.4 + 306.5 + 306.6 + 306.7 + 306.8 + 306.9 + 306.10 +
307.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 307.2 +++ b/en/examples/results/template.simple.rev.out Mon Mar 09 21:37:47 2009 -0700 307.3 @@ -0,0 +1,3 @@ 307.4 + 307.5 + 307.6 +
308.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 308.2 +++ b/en/examples/results/template.simple.simplest.out Mon Mar 09 21:37:47 2009 -0700 308.3 @@ -0,0 +1,2 @@ 308.4 + 308.5 +
309.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 309.2 +++ b/en/examples/results/template.simple.simplesub.out Mon Mar 09 21:37:47 2009 -0700 309.3 @@ -0,0 +1,7 @@ 309.4 + 309.5 + 309.6 + 309.7 + 309.8 + 309.9 + 309.10 +
310.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 310.2 +++ b/en/examples/results/template.svnstyle.id.out Mon Mar 09 21:37:47 2009 -0700 310.3 @@ -0,0 +1,1 @@ 310.4 +$ \textbf{hg log -r0 --template '\{node\}'}
311.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 311.2 +++ b/en/examples/results/template.svnstyle.result.out Mon Mar 09 21:37:47 2009 -0700 311.3 @@ -0,0 +1,11 @@ 311.4 +$ \textbf{hg log -r1 --style svn.style} 311.5 +------------------------------------------------------------------------ 311.6 + 311.7 +r1 | bos | 2009-01-30 06:40 +0000 (Fri, 30 Jan 2009 06:40:17 +0000) 311.8 + 311.9 +added line to end of <<hello>> file. 311.10 + 311.11 +in addition, added a file with the helpful name (at least i hope that some 311.12 +might consider it so) of goodbye. 311.13 + 311.14 +------------------------------------------------------------------------
312.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 312.2 +++ b/en/examples/results/template.svnstyle.short.out Mon Mar 09 21:37:47 2009 -0700 312.3 @@ -0,0 +1,10 @@ 312.4 +$ \textbf{svn log -r9653} 312.5 +------------------------------------------------------------------------ 312.6 +r9653 | sean.hefty | 2006-09-27 14:39:55 -0700 (Wed, 27 Sep 2006) | 5 lines 312.7 + 312.8 +On reporting a route error, also include the status for the error, 312.9 +rather than indicating a status of 0 when an error has occurred. 312.10 + 312.11 +Signed-off-by: Sean Hefty <sean.hefty@intel.com> 312.12 + 312.13 +------------------------------------------------------------------------
313.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 313.2 +++ b/en/examples/results/template.svnstyle.simplest.out Mon Mar 09 21:37:47 2009 -0700 313.3 @@ -0,0 +1,4 @@ 313.4 +$ \textbf{cat svn.style} 313.5 +changeset = "\{node|short\}\textbackslash{}n" 313.6 +$ \textbf{hg log -r1 --style svn.style} 313.7 +
314.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 314.2 +++ b/en/examples/results/template.svnstyle.style.out Mon Mar 09 21:37:47 2009 -0700 314.3 @@ -0,0 +1,3 @@ 314.4 +$ \textbf{cat svn.style} 314.5 +header = '------------------------------------------------------------------------\textbackslash{}n\textbackslash{}n' 314.6 +changeset = svn.template
315.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 315.2 +++ b/en/examples/results/template.svnstyle.syntax.error.out Mon Mar 09 21:37:47 2009 -0700 315.3 @@ -0,0 +1,2 @@ 315.4 +$ \textbf{hg log -r1 --style broken.style} 315.5 +abort: broken.style:1: parse error
316.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 316.2 +++ b/en/examples/results/template.svnstyle.syntax.input.out Mon Mar 09 21:37:47 2009 -0700 316.3 @@ -0,0 +1,2 @@ 316.4 +$ \textbf{cat broken.style} 316.5 +changeset =
317.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 317.2 +++ b/en/examples/results/template.svnstyle.template.out Mon Mar 09 21:37:47 2009 -0700 317.3 @@ -0,0 +1,6 @@ 317.4 +$ \textbf{cat svn.template} 317.5 +r\{rev\} | \{author|user\} | \{date|isodate\} (\{date|rfc822date\}) 317.6 + 317.7 +\{desc|strip|fill76\} 317.8 + 317.9 +------------------------------------------------------------------------
318.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 318.2 +++ b/en/examples/results/tour-merge-conflict.commit.out Mon Mar 09 21:37:47 2009 -0700 318.3 @@ -0,0 +1,16 @@ 318.4 +$ \textbf{cat > letter.txt <<EOF} 318.5 +> \textbf{Greetings!} 318.6 +> \textbf{I am Bryan O'Sullivan, no relation of the former} 318.7 +> \textbf{Nigerian dictator Sani Abacha.} 318.8 +> \textbf{EOF} 318.9 +$ \textbf{hg resolve -m letter.txt} 318.10 +$ \textbf{hg commit -m 'Send me your money'} 318.11 +$ \textbf{hg tip} 318.12 +changeset: 318.13 +tag: tip 318.14 +parent: 318.15 +parent: 318.16 +user: Bryan O'Sullivan <bos@serpentine.com> 318.17 + 318.18 +summary: Send me your money 318.19 +
319.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 319.2 +++ b/en/examples/results/tour-merge-conflict.cousin.out Mon Mar 09 21:37:47 2009 -0700 319.3 @@ -0,0 +1,11 @@ 319.4 +$ \textbf{cd ..} 319.5 +$ \textbf{hg clone scam scam-cousin} 319.6 +updating working directory 319.7 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 319.8 +$ \textbf{cd scam-cousin} 319.9 +$ \textbf{cat > letter.txt <<EOF} 319.10 +> \textbf{Greetings!} 319.11 +> \textbf{I am Shehu Musa Abacha, cousin to the former} 319.12 +> \textbf{Nigerian dictator Sani Abacha.} 319.13 +> \textbf{EOF} 319.14 +$ \textbf{hg commit -m '419 scam, with cousin'}
320.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 320.2 +++ b/en/examples/results/tour-merge-conflict.merge.out Mon Mar 09 21:37:47 2009 -0700 320.3 @@ -0,0 +1,17 @@ 320.4 +$ \textbf{export HGMERGE=merge} 320.5 +$ \textbf{echo 'XXX this is broken and must be fixed'} 320.6 +XXX this is broken and must be fixed 320.7 +$ \textbf{hg merge} 320.8 +merging letter.txt 320.9 +merge: warning: conflicts during merge 320.10 +merging letter.txt failed! 320.11 +0 files updated, 0 files merged, 0 files removed, 1 files unresolved 320.12 +use 'hg resolve' to retry unresolved file merges 320.13 +$ \textbf{cat letter.txt} 320.14 +Greetings! 320.15 + 320.16 +I am Shehu Musa Abacha, cousin to the former 320.17 +======= 320.18 +I am Alhaji Abba Abacha, son of the former 320.19 + 320.20 +Nigerian dictator Sani Abacha.
321.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 321.2 +++ b/en/examples/results/tour-merge-conflict.pull.out Mon Mar 09 21:37:47 2009 -0700 321.3 @@ -0,0 +1,14 @@ 321.4 +$ \textbf{cd ..} 321.5 +$ \textbf{hg clone scam-cousin scam-merge} 321.6 +updating working directory 321.7 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 321.8 +$ \textbf{cd scam-merge} 321.9 +$ \textbf{hg pull -u ../scam-son} 321.10 +pulling from ../scam-son 321.11 +searching for changes 321.12 +adding changesets 321.13 +adding manifests 321.14 +adding file changes 321.15 +added 1 changesets with 1 changes to 1 files (+1 heads) 321.16 +not updating, since new heads added 321.17 +(run 'hg heads' to see heads, 'hg merge' to merge)
322.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 322.2 +++ b/en/examples/results/tour-merge-conflict.son.out Mon Mar 09 21:37:47 2009 -0700 322.3 @@ -0,0 +1,11 @@ 322.4 +$ \textbf{cd ..} 322.5 +$ \textbf{hg clone scam scam-son} 322.6 +updating working directory 322.7 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 322.8 +$ \textbf{cd scam-son} 322.9 +$ \textbf{cat > letter.txt <<EOF} 322.10 +> \textbf{Greetings!} 322.11 +> \textbf{I am Alhaji Abba Abacha, son of the former} 322.12 +> \textbf{Nigerian dictator Sani Abacha.} 322.13 +> \textbf{EOF} 322.14 +$ \textbf{hg commit -m '419 scam, with son'}
323.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 323.2 +++ b/en/examples/results/tour-merge-conflict.wife.out Mon Mar 09 21:37:47 2009 -0700 323.3 @@ -0,0 +1,7 @@ 323.4 +$ \textbf{cat > letter.txt <<EOF} 323.5 +> \textbf{Greetings!} 323.6 +> \textbf{I am Mariam Abacha, the wife of former} 323.7 +> \textbf{Nigerian dictator Sani Abacha.} 323.8 +> \textbf{EOF} 323.9 +$ \textbf{hg add letter.txt} 323.10 +$ \textbf{hg commit -m '419 scam, first draft'}
324.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 324.2 +++ b/en/examples/results/tour.clone-pull.out Mon Mar 09 21:37:47 2009 -0700 324.3 @@ -0,0 +1,4 @@ 324.4 +$ \textbf{cd ..} 324.5 +$ \textbf{hg clone hello hello-pull} 324.6 +updating working directory 324.7 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved
325.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 325.2 +++ b/en/examples/results/tour.clone-push.out Mon Mar 09 21:37:47 2009 -0700 325.3 @@ -0,0 +1,4 @@ 325.4 +$ \textbf{cd ..} 325.5 +$ \textbf{hg clone hello hello-push} 325.6 +updating working directory 325.7 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved
326.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 326.2 +++ b/en/examples/results/tour.clone.out Mon Mar 09 21:37:47 2009 -0700 326.3 @@ -0,0 +1,9 @@ 326.4 +$ \textbf{hg clone http://hg.serpentine.com/tutorial/hello} 326.5 +destination directory: hello 326.6 +requesting all changes 326.7 +adding changesets 326.8 +adding manifests 326.9 +adding file changes 326.10 +added 5 changesets with 5 changes to 2 files 326.11 +updating working directory 326.12 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved
327.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 327.2 +++ b/en/examples/results/tour.commit.out Mon Mar 09 21:37:47 2009 -0700 327.3 @@ -0,0 +1,1 @@ 327.4 +$ \textbf{hg commit}
328.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 328.2 +++ b/en/examples/results/tour.diff.out Mon Mar 09 21:37:47 2009 -0700 328.3 @@ -0,0 +1,11 @@ 328.4 +$ \textbf{hg diff} 328.5 +diff -r hello.c 328.6 + 328.7 + 328.8 +@@ -8,5 +8,6 @@ 328.9 + int main(int argc, char **argv) 328.10 + \{ 328.11 + printf("hello, world!\textbackslash{}"); 328.12 ++ printf("hello again!\textbackslash{}n"); 328.13 + return 0; 328.14 + \}
329.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 329.2 +++ b/en/examples/results/tour.help.out Mon Mar 09 21:37:47 2009 -0700 329.3 @@ -0,0 +1,19 @@ 329.4 +$ \textbf{hg help init} 329.5 +hg init [-e CMD] [--remotecmd CMD] [DEST] 329.6 + 329.7 +create a new repository in the given directory 329.8 + 329.9 + Initialize a new repository in the given directory. If the given 329.10 + directory does not exist, it is created. 329.11 + 329.12 + If no directory is given, the current directory is used. 329.13 + 329.14 + It is possible to specify an ssh:// URL as the destination. 329.15 + See 'hg help urls' for more information. 329.16 + 329.17 +options: 329.18 + 329.19 + -e --ssh specify ssh command to use 329.20 + --remotecmd specify hg command to run on the remote side 329.21 + 329.22 +use "hg -v help init" to show global options
330.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 330.2 +++ b/en/examples/results/tour.incoming.out Mon Mar 09 21:37:47 2009 -0700 330.3 @@ -0,0 +1,10 @@ 330.4 +$ \textbf{cd hello-pull} 330.5 +$ \textbf{hg incoming ../my-hello} 330.6 +comparing with ../my-hello 330.7 +searching for changes 330.8 +changeset: 330.9 +tag: tip 330.10 +user: Bryan O'Sullivan <bos@serpentine.com> 330.11 + 330.12 +summary: Added an extra line of output 330.13 +
331.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 331.2 +++ b/en/examples/results/tour.log-r.out Mon Mar 09 21:37:47 2009 -0700 331.3 @@ -0,0 +1,24 @@ 331.4 +$ \textbf{hg log -r 3} 331.5 +changeset: 331.6 +user: Bryan O'Sullivan <bos@serpentine.com> 331.7 + 331.8 +summary: Get make to generate the final binary from a .o file. 331.9 + 331.10 +$ \textbf{hg log -r } 331.11 +changeset: 331.12 +user: Bryan O'Sullivan <bos@serpentine.com> 331.13 + 331.14 +summary: Get make to generate the final binary from a .o file. 331.15 + 331.16 +$ \textbf{hg log -r 1 -r 4} 331.17 +changeset: 331.18 +user: mpm@selenic.com 331.19 + 331.20 +summary: Create a makefile 331.21 + 331.22 +changeset: 331.23 +tag: tip 331.24 +user: Bryan O'Sullivan <bos@serpentine.com> 331.25 + 331.26 +summary: Trim comments. 331.27 +
332.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 332.2 +++ b/en/examples/results/tour.log-v.out Mon Mar 09 21:37:47 2009 -0700 332.3 @@ -0,0 +1,9 @@ 332.4 +$ \textbf{hg log -v -r 3} 332.5 +changeset: 332.6 +user: Bryan O'Sullivan <bos@serpentine.com> 332.7 + 332.8 +files: Makefile 332.9 +description: 332.10 +Get make to generate the final binary from a .o file. 332.11 + 332.12 +
333.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 333.2 +++ b/en/examples/results/tour.log-vp.out Mon Mar 09 21:37:47 2009 -0700 333.3 @@ -0,0 +1,21 @@ 333.4 +$ \textbf{hg log -v -p -r 2} 333.5 +changeset: 333.6 +user: Bryan O'Sullivan <bos@serpentine.com> 333.7 + 333.8 +files: hello.c 333.9 +description: 333.10 +Introduce a typo into hello.c. 333.11 + 333.12 + 333.13 +diff -r -r hello.c 333.14 + 333.15 + 333.16 +@@ -11,6 +11,6 @@ 333.17 + 333.18 + int main(int argc, char **argv) 333.19 + \{ 333.20 +- printf("hello, world!\textbackslash{}n"); 333.21 ++ printf("hello, world!\textbackslash{}"); 333.22 + return 0; 333.23 + \} 333.24 +
334.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 334.2 +++ b/en/examples/results/tour.log.out Mon Mar 09 21:37:47 2009 -0700 334.3 @@ -0,0 +1,27 @@ 334.4 +$ \textbf{hg log} 334.5 +changeset: 334.6 +tag: tip 334.7 +user: Bryan O'Sullivan <bos@serpentine.com> 334.8 + 334.9 +summary: Trim comments. 334.10 + 334.11 +changeset: 334.12 +user: Bryan O'Sullivan <bos@serpentine.com> 334.13 + 334.14 +summary: Get make to generate the final binary from a .o file. 334.15 + 334.16 +changeset: 334.17 +user: Bryan O'Sullivan <bos@serpentine.com> 334.18 + 334.19 +summary: Introduce a typo into hello.c. 334.20 + 334.21 +changeset: 334.22 +user: mpm@selenic.com 334.23 + 334.24 +summary: Create a makefile 334.25 + 334.26 +changeset: 334.27 +user: mpm@selenic.com 334.28 + 334.29 +summary: Create a standard "hello, world" program 334.30 +
335.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 335.2 +++ b/en/examples/results/tour.log.range.out Mon Mar 09 21:37:47 2009 -0700 335.3 @@ -0,0 +1,17 @@ 335.4 +$ \textbf{hg log -r 2:4} 335.5 +changeset: 335.6 +user: Bryan O'Sullivan <bos@serpentine.com> 335.7 + 335.8 +summary: Introduce a typo into hello.c. 335.9 + 335.10 +changeset: 335.11 +user: Bryan O'Sullivan <bos@serpentine.com> 335.12 + 335.13 +summary: Get make to generate the final binary from a .o file. 335.14 + 335.15 +changeset: 335.16 +tag: tip 335.17 +user: Bryan O'Sullivan <bos@serpentine.com> 335.18 + 335.19 +summary: Trim comments. 335.20 +
336.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 336.2 +++ b/en/examples/results/tour.ls-a.out Mon Mar 09 21:37:47 2009 -0700 336.3 @@ -0,0 +1,3 @@ 336.4 +$ \textbf{cd hello} 336.5 +$ \textbf{ls -a} 336.6 +. .. .hg Makefile hello.c
337.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 337.2 +++ b/en/examples/results/tour.ls.out Mon Mar 09 21:37:47 2009 -0700 337.3 @@ -0,0 +1,5 @@ 337.4 +$ \textbf{ls -l} 337.5 + 337.6 + 337.7 +$ \textbf{ls hello} 337.8 +Makefile hello.c
338.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 338.2 +++ b/en/examples/results/tour.merge.cat.out Mon Mar 09 21:37:47 2009 -0700 338.3 @@ -0,0 +1,28 @@ 338.4 +$ \textbf{cat hello.c} 338.5 +/* 338.6 + * Placed in the public domain by Bryan O'Sullivan. This program is 338.7 + * not covered by patents in the United States or other countries. 338.8 + */ 338.9 + 338.10 +#include <stdio.h> 338.11 + 338.12 +int main(int argc, char **argv) 338.13 +\{ 338.14 + printf("once more, hello.\textbackslash{}n"); 338.15 + printf("hello, world!\textbackslash{}"); 338.16 + return 0; 338.17 +\} 338.18 +$ \textbf{cat ../my-hello/hello.c} 338.19 +/* 338.20 + * Placed in the public domain by Bryan O'Sullivan. This program is 338.21 + * not covered by patents in the United States or other countries. 338.22 + */ 338.23 + 338.24 +#include <stdio.h> 338.25 + 338.26 +int main(int argc, char **argv) 338.27 +\{ 338.28 + printf("hello, world!\textbackslash{}"); 338.29 + printf("hello again!\textbackslash{}n"); 338.30 + return 0; 338.31 +\}
339.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 339.2 +++ b/en/examples/results/tour.merge.clone.out Mon Mar 09 21:37:47 2009 -0700 339.3 @@ -0,0 +1,7 @@ 339.4 +$ \textbf{cd ..} 339.5 +$ \textbf{hg clone hello my-new-hello} 339.6 +updating working directory 339.7 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved 339.8 +$ \textbf{cd my-new-hello} 339.9 +$ \textbf{sed -i '/printf/i\textbackslash{}\textbackslash{}tprintf("once more, hello.\textbackslash{}\textbackslash{}n");' hello.c} 339.10 +$ \textbf{hg commit -m 'A new hello for a new day.'}
340.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 340.2 +++ b/en/examples/results/tour.merge.commit.out Mon Mar 09 21:37:47 2009 -0700 340.3 @@ -0,0 +1,1 @@ 340.4 +$ \textbf{hg commit -m 'Merged changes'}
341.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 341.2 +++ b/en/examples/results/tour.merge.heads.out Mon Mar 09 21:37:47 2009 -0700 341.3 @@ -0,0 +1,13 @@ 341.4 +$ \textbf{hg heads} 341.5 +changeset: 341.6 +tag: tip 341.7 +parent: 341.8 +user: Bryan O'Sullivan <bos@serpentine.com> 341.9 + 341.10 +summary: Added an extra line of output 341.11 + 341.12 +changeset: 341.13 +user: Bryan O'Sullivan <bos@serpentine.com> 341.14 + 341.15 +summary: A new hello for a new day. 341.16 +
342.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 342.2 +++ b/en/examples/results/tour.merge.merge.out Mon Mar 09 21:37:47 2009 -0700 342.3 @@ -0,0 +1,4 @@ 342.4 +$ \textbf{hg merge} 342.5 +merging hello.c 342.6 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved 342.7 +(branch merge, don't forget to commit)
343.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 343.2 +++ b/en/examples/results/tour.merge.parents.out Mon Mar 09 21:37:47 2009 -0700 343.3 @@ -0,0 +1,28 @@ 343.4 +$ \textbf{hg parents} 343.5 +changeset: 343.6 +user: Bryan O'Sullivan <bos@serpentine.com> 343.7 + 343.8 +summary: A new hello for a new day. 343.9 + 343.10 +changeset: 343.11 +tag: tip 343.12 +parent: 343.13 +user: Bryan O'Sullivan <bos@serpentine.com> 343.14 + 343.15 +summary: Added an extra line of output 343.16 + 343.17 +$ \textbf{cat hello.c} 343.18 +/* 343.19 + * Placed in the public domain by Bryan O'Sullivan. This program is 343.20 + * not covered by patents in the United States or other countries. 343.21 + */ 343.22 + 343.23 +#include <stdio.h> 343.24 + 343.25 +int main(int argc, char **argv) 343.26 +\{ 343.27 + printf("once more, hello.\textbackslash{}n"); 343.28 + printf("hello, world!\textbackslash{}"); 343.29 + printf("hello again!\textbackslash{}n"); 343.30 + return 0; 343.31 +\}
344.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 344.2 +++ b/en/examples/results/tour.merge.pull.out Mon Mar 09 21:37:47 2009 -0700 344.3 @@ -0,0 +1,8 @@ 344.4 +$ \textbf{hg pull ../my-hello} 344.5 +pulling from ../my-hello 344.6 +searching for changes 344.7 +adding changesets 344.8 +adding manifests 344.9 +adding file changes 344.10 +added 1 changesets with 1 changes to 1 files (+1 heads) 344.11 +(run 'hg heads' to see heads, 'hg merge' to merge)
345.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 345.2 +++ b/en/examples/results/tour.merge.tip.out Mon Mar 09 21:37:47 2009 -0700 345.3 @@ -0,0 +1,9 @@ 345.4 +$ \textbf{hg tip} 345.5 +changeset: 345.6 +tag: tip 345.7 +parent: 345.8 +parent: 345.9 +user: Bryan O'Sullivan <bos@serpentine.com> 345.10 + 345.11 +summary: Merged changes 345.12 +
346.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 346.2 +++ b/en/examples/results/tour.merge.update.out Mon Mar 09 21:37:47 2009 -0700 346.3 @@ -0,0 +1,2 @@ 346.4 +$ \textbf{hg update} 346.5 +abort: crosses branches (use 'hg merge' or 'hg update -C')
347.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 347.2 +++ b/en/examples/results/tour.older.out Mon Mar 09 21:37:47 2009 -0700 347.3 @@ -0,0 +1,10 @@ 347.4 +$ \textbf{hg update 2} 347.5 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved 347.6 +$ \textbf{hg parents} 347.7 +changeset: 347.8 +user: Bryan O'Sullivan <bos@serpentine.com> 347.9 + 347.10 +summary: Introduce a typo into hello.c. 347.11 + 347.12 +$ \textbf{hg update} 347.13 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved
348.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 348.2 +++ b/en/examples/results/tour.outgoing.net.out Mon Mar 09 21:37:47 2009 -0700 348.3 @@ -0,0 +1,9 @@ 348.4 +$ \textbf{hg outgoing http://hg.serpentine.com/tutorial/hello} 348.5 +comparing with http://hg.serpentine.com/tutorial/hello 348.6 +searching for changes 348.7 +changeset: 348.8 +tag: tip 348.9 +user: Bryan O'Sullivan <bos@serpentine.com> 348.10 + 348.11 +summary: Added an extra line of output 348.12 +
349.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 349.2 +++ b/en/examples/results/tour.outgoing.out Mon Mar 09 21:37:47 2009 -0700 349.3 @@ -0,0 +1,10 @@ 349.4 +$ \textbf{cd my-hello} 349.5 +$ \textbf{hg outgoing ../hello-push} 349.6 +comparing with ../hello-push 349.7 +searching for changes 349.8 +changeset: 349.9 +tag: tip 349.10 +user: Bryan O'Sullivan <bos@serpentine.com> 349.11 + 349.12 +summary: Added an extra line of output 349.13 +
350.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 350.2 +++ b/en/examples/results/tour.parents.out Mon Mar 09 21:37:47 2009 -0700 350.3 @@ -0,0 +1,7 @@ 350.4 +$ \textbf{hg parents} 350.5 +changeset: 350.6 +tag: tip 350.7 +user: Bryan O'Sullivan <bos@serpentine.com> 350.8 + 350.9 +summary: Added an extra line of output 350.10 +
351.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 351.2 +++ b/en/examples/results/tour.pull.out Mon Mar 09 21:37:47 2009 -0700 351.3 @@ -0,0 +1,22 @@ 351.4 +$ \textbf{hg tip} 351.5 +changeset: 351.6 +tag: tip 351.7 +user: Bryan O'Sullivan <bos@serpentine.com> 351.8 + 351.9 +summary: Trim comments. 351.10 + 351.11 +$ \textbf{hg pull ../my-hello} 351.12 +pulling from ../my-hello 351.13 +searching for changes 351.14 +adding changesets 351.15 +adding manifests 351.16 +adding file changes 351.17 +added 1 changesets with 1 changes to 1 files 351.18 +(run 'hg update' to get a working copy) 351.19 +$ \textbf{hg tip} 351.20 +changeset: 351.21 +tag: tip 351.22 +user: Bryan O'Sullivan <bos@serpentine.com> 351.23 + 351.24 +summary: Added an extra line of output 351.25 +
352.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 352.2 +++ b/en/examples/results/tour.push.net.out Mon Mar 09 21:37:47 2009 -0700 352.3 @@ -0,0 +1,4 @@ 352.4 +$ \textbf{hg push http://hg.serpentine.com/tutorial/hello} 352.5 +pushing to http://hg.serpentine.com/tutorial/hello 352.6 +searching for changes 352.7 +ssl required
353.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 353.2 +++ b/en/examples/results/tour.push.nothing.out Mon Mar 09 21:37:47 2009 -0700 353.3 @@ -0,0 +1,4 @@ 353.4 +$ \textbf{hg push ../hello-push} 353.5 +pushing to ../hello-push 353.6 +searching for changes 353.7 +no changes found
354.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 354.2 +++ b/en/examples/results/tour.push.out Mon Mar 09 21:37:47 2009 -0700 354.3 @@ -0,0 +1,7 @@ 354.4 +$ \textbf{hg push ../hello-push} 354.5 +pushing to ../hello-push 354.6 +searching for changes 354.7 +adding changesets 354.8 +adding manifests 354.9 +adding file changes 354.10 +added 1 changesets with 1 changes to 1 files
355.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 355.2 +++ b/en/examples/results/tour.reclone.out Mon Mar 09 21:37:47 2009 -0700 355.3 @@ -0,0 +1,5 @@ 355.4 +$ \textbf{cd ..} 355.5 +$ \textbf{hg clone hello my-hello} 355.6 +updating working directory 355.7 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved 355.8 +$ \textbf{cd my-hello}
356.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 356.2 +++ b/en/examples/results/tour.sed.out Mon Mar 09 21:37:47 2009 -0700 356.3 @@ -0,0 +1,1 @@ 356.4 +$ \textbf{sed -i '/printf/a\textbackslash{}\textbackslash{}tprintf("hello again!\textbackslash{}\textbackslash{}n");' hello.c}
357.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 357.2 +++ b/en/examples/results/tour.status.out Mon Mar 09 21:37:47 2009 -0700 357.3 @@ -0,0 +1,4 @@ 357.4 +$ \textbf{ls} 357.5 +Makefile hello.c 357.6 +$ \textbf{hg status} 357.7 +M hello.c
358.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 358.2 +++ b/en/examples/results/tour.tip.out Mon Mar 09 21:37:47 2009 -0700 358.3 @@ -0,0 +1,21 @@ 358.4 +$ \textbf{hg tip -vp} 358.5 +changeset: 358.6 +tag: tip 358.7 +user: Bryan O'Sullivan <bos@serpentine.com> 358.8 + 358.9 +files: hello.c 358.10 +description: 358.11 +Added an extra line of output 358.12 + 358.13 + 358.14 +diff -r -r hello.c 358.15 + 358.16 + 358.17 +@@ -8,5 +8,6 @@ 358.18 + int main(int argc, char **argv) 358.19 + \{ 358.20 + printf("hello, world!\textbackslash{}"); 358.21 ++ printf("hello again!\textbackslash{}n"); 358.22 + return 0; 358.23 + \} 358.24 +
359.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 359.2 +++ b/en/examples/results/tour.update.out Mon Mar 09 21:37:47 2009 -0700 359.3 @@ -0,0 +1,7 @@ 359.4 +$ \textbf{grep printf hello.c} 359.5 + printf("hello, world!\textbackslash{}"); 359.6 +$ \textbf{hg update tip} 359.7 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 359.8 +$ \textbf{grep printf hello.c} 359.9 + printf("hello, world!\textbackslash{}"); 359.10 + printf("hello again!\textbackslash{}n");
360.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 360.2 +++ b/en/examples/results/tour.version.out Mon Mar 09 21:37:47 2009 -0700 360.3 @@ -0,0 +1,6 @@ 360.4 +$ \textbf{hg version} 360.5 +Mercurial Distributed SCM (version ) 360.6 + 360.7 +Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others 360.8 +This is free software; see the source for copying conditions. There is NO 360.9 +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
361.1 --- a/en/examples/rollback.add.out Mon Mar 09 21:13:56 2009 -0700 361.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 361.3 @@ -1,2 +0,0 @@ 361.4 -$ \textbf{hg add b} 361.5 -$ \textbf{hg commit -m 'Add file b, this time for real'}
362.1 --- a/en/examples/rollback.commit.out Mon Mar 09 21:13:56 2009 -0700 362.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 362.3 @@ -1,4 +0,0 @@ 362.4 -$ \textbf{hg status} 362.5 -M a 362.6 -$ \textbf{echo b > b} 362.7 -$ \textbf{hg commit -m 'Add file b'}
363.1 --- a/en/examples/rollback.rollback.out Mon Mar 09 21:13:56 2009 -0700 363.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 363.3 @@ -1,12 +0,0 @@ 363.4 -$ \textbf{hg rollback} 363.5 -rolling back last transaction 363.6 -$ \textbf{hg tip} 363.7 -changeset: 363.8 -tag: tip 363.9 -user: Bryan O'Sullivan <bos@serpentine.com> 363.10 - 363.11 -summary: First commit 363.12 - 363.13 -$ \textbf{hg status} 363.14 -M a 363.15 -? b
364.1 --- a/en/examples/rollback.status.out Mon Mar 09 21:13:56 2009 -0700 364.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 364.3 @@ -1,9 +0,0 @@ 364.4 -$ \textbf{hg status} 364.5 -? b 364.6 -$ \textbf{hg tip} 364.7 -changeset: 364.8 -tag: tip 364.9 -user: Bryan O'Sullivan <bos@serpentine.com> 364.10 - 364.11 -summary: Add file b 364.12 -
365.1 --- a/en/examples/rollback.twice.out Mon Mar 09 21:13:56 2009 -0700 365.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 365.3 @@ -1,4 +0,0 @@ 365.4 -$ \textbf{hg rollback} 365.5 -rolling back last transaction 365.6 -$ \textbf{hg rollback} 365.7 -no rollback information available
366.1 --- a/en/examples/tag.init.out Mon Mar 09 21:13:56 2009 -0700 366.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 366.3 @@ -1,5 +0,0 @@ 366.4 -$ \textbf{hg init mytag} 366.5 -$ \textbf{cd mytag} 366.6 -$ \textbf{echo hello > myfile} 366.7 -$ \textbf{hg commit -A -m 'Initial commit'} 366.8 -adding myfile
367.1 --- a/en/examples/tag.log.out Mon Mar 09 21:13:56 2009 -0700 367.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 367.3 @@ -1,13 +0,0 @@ 367.4 -$ \textbf{hg log} 367.5 -changeset: 367.6 -tag: tip 367.7 -user: Bryan O'Sullivan <bos@serpentine.com> 367.8 - 367.9 -summary: Added tag v1.0 for changeset 367.10 - 367.11 -changeset: 367.12 -tag: v1.0 367.13 -user: Bryan O'Sullivan <bos@serpentine.com> 367.14 - 367.15 -summary: Initial commit 367.16 -
368.1 --- a/en/examples/tag.log.v1.0.out Mon Mar 09 21:13:56 2009 -0700 368.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 368.3 @@ -1,10 +0,0 @@ 368.4 -$ \textbf{echo goodbye > myfile2} 368.5 -$ \textbf{hg commit -A -m 'Second commit'} 368.6 -adding myfile2 368.7 -$ \textbf{hg log -r v1.0} 368.8 -changeset: 368.9 -tag: v1.0 368.10 -user: Bryan O'Sullivan <bos@serpentine.com> 368.11 - 368.12 -summary: Initial commit 368.13 -
369.1 --- a/en/examples/tag.remove.out Mon Mar 09 21:13:56 2009 -0700 369.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 369.3 @@ -1,3 +0,0 @@ 369.4 -$ \textbf{hg tag --remove v1.0} 369.5 -$ \textbf{hg tags} 369.6 -tip
370.1 --- a/en/examples/tag.replace.out Mon Mar 09 21:13:56 2009 -0700 370.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 370.3 @@ -1,10 +0,0 @@ 370.4 -$ \textbf{hg tag -r 1 v1.1} 370.5 -$ \textbf{hg tags} 370.6 -tip 370.7 -v1.1 370.8 -$ \textbf{hg tag -r 2 v1.1} 370.9 -abort: tag 'v1.1' already exists (use -f to force) 370.10 -$ \textbf{hg tag -f -r 2 v1.1} 370.11 -$ \textbf{hg tags} 370.12 -tip 370.13 -v1.1
371.1 --- a/en/examples/tag.tag.out Mon Mar 09 21:13:56 2009 -0700 371.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 371.3 @@ -1,1 +0,0 @@ 371.4 -$ \textbf{hg tag v1.0}
372.1 --- a/en/examples/tag.tags.out Mon Mar 09 21:13:56 2009 -0700 372.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 372.3 @@ -1,3 +0,0 @@ 372.4 -$ \textbf{hg tags} 372.5 -tip 372.6 -v1.0
373.1 --- a/en/examples/tag.tip.out Mon Mar 09 21:13:56 2009 -0700 373.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 373.3 @@ -1,7 +0,0 @@ 373.4 -$ \textbf{hg tip} 373.5 -changeset: 373.6 -tag: tip 373.7 -user: Bryan O'Sullivan <bos@serpentine.com> 373.8 - 373.9 -summary: Added tag v1.1 for changeset 373.10 -
374.1 --- a/en/examples/template.simple.changelog.out Mon Mar 09 21:13:56 2009 -0700 374.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 374.3 @@ -1,22 +0,0 @@ 374.4 - 374.5 - 374.6 - 374.7 - 374.8 - 374.9 - 374.10 - 374.11 - 374.12 - 374.13 - 374.14 - 374.15 - 374.16 - 374.17 - 374.18 - 374.19 - 374.20 - 374.21 - 374.22 - 374.23 - 374.24 - 374.25 -
375.1 --- a/en/examples/template.simple.combine.out Mon Mar 09 21:13:56 2009 -0700 375.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 375.3 @@ -1,6 +0,0 @@ 375.4 - 375.5 - 375.6 - 375.7 - 375.8 - 375.9 -
376.1 --- a/en/examples/template.simple.compact.out Mon Mar 09 21:13:56 2009 -0700 376.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 376.3 @@ -1,13 +0,0 @@ 376.4 - 376.5 - 376.6 - 376.7 - 376.8 - 376.9 - 376.10 - 376.11 - 376.12 - 376.13 - 376.14 - 376.15 - 376.16 -
377.1 --- a/en/examples/template.simple.datekeyword.out Mon Mar 09 21:13:56 2009 -0700 377.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 377.3 @@ -1,4 +0,0 @@ 377.4 - 377.5 - 377.6 - 377.7 -
378.1 --- a/en/examples/template.simple.keywords.out Mon Mar 09 21:13:56 2009 -0700 378.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 378.3 @@ -1,21 +0,0 @@ 378.4 - 378.5 - 378.6 - 378.7 - 378.8 - 378.9 - 378.10 - 378.11 - 378.12 - 378.13 - 378.14 - 378.15 - 378.16 - 378.17 - 378.18 - 378.19 - 378.20 - 378.21 - 378.22 - 378.23 - 378.24 -
379.1 --- a/en/examples/template.simple.manyfilters.out Mon Mar 09 21:13:56 2009 -0700 379.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 379.3 @@ -1,62 +0,0 @@ 379.4 - 379.5 - 379.6 - 379.7 - 379.8 - 379.9 - 379.10 - 379.11 - 379.12 - 379.13 - 379.14 - 379.15 - 379.16 - 379.17 - 379.18 - 379.19 - 379.20 - 379.21 - 379.22 - 379.23 - 379.24 - 379.25 - 379.26 - 379.27 - 379.28 - 379.29 - 379.30 - 379.31 - 379.32 - 379.33 - 379.34 - 379.35 - 379.36 - 379.37 - 379.38 - 379.39 - 379.40 - 379.41 - 379.42 - 379.43 - 379.44 - 379.45 - 379.46 - 379.47 - 379.48 - 379.49 - 379.50 - 379.51 - 379.52 - 379.53 - 379.54 - 379.55 - 379.56 - 379.57 - 379.58 - 379.59 - 379.60 - 379.61 - 379.62 - 379.63 - 379.64 - 379.65 -
380.1 --- a/en/examples/template.simple.normal.out Mon Mar 09 21:13:56 2009 -0700 380.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 380.3 @@ -1,7 +0,0 @@ 380.4 - 380.5 - 380.6 - 380.7 - 380.8 - 380.9 - 380.10 -
381.1 --- a/en/examples/template.simple.rev.out Mon Mar 09 21:13:56 2009 -0700 381.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 381.3 @@ -1,3 +0,0 @@ 381.4 - 381.5 - 381.6 -
382.1 --- a/en/examples/template.simple.simplest.out Mon Mar 09 21:13:56 2009 -0700 382.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 382.3 @@ -1,2 +0,0 @@ 382.4 - 382.5 -
383.1 --- a/en/examples/template.simple.simplesub.out Mon Mar 09 21:13:56 2009 -0700 383.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 383.3 @@ -1,7 +0,0 @@ 383.4 - 383.5 - 383.6 - 383.7 - 383.8 - 383.9 - 383.10 -
384.1 --- a/en/examples/template.svnstyle.id.out Mon Mar 09 21:13:56 2009 -0700 384.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 384.3 @@ -1,1 +0,0 @@ 384.4 -$ \textbf{hg log -r0 --template '\{node\}'}
385.1 --- a/en/examples/template.svnstyle.result.out Mon Mar 09 21:13:56 2009 -0700 385.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 385.3 @@ -1,11 +0,0 @@ 385.4 -$ \textbf{hg log -r1 --style svn.style} 385.5 ------------------------------------------------------------------------- 385.6 - 385.7 -r1 | bos | 2009-01-30 06:40 +0000 (Fri, 30 Jan 2009 06:40:17 +0000) 385.8 - 385.9 -added line to end of <<hello>> file. 385.10 - 385.11 -in addition, added a file with the helpful name (at least i hope that some 385.12 -might consider it so) of goodbye. 385.13 - 385.14 -------------------------------------------------------------------------
386.1 --- a/en/examples/template.svnstyle.short.out Mon Mar 09 21:13:56 2009 -0700 386.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 386.3 @@ -1,10 +0,0 @@ 386.4 -$ \textbf{svn log -r9653} 386.5 ------------------------------------------------------------------------- 386.6 -r9653 | sean.hefty | 2006-09-27 14:39:55 -0700 (Wed, 27 Sep 2006) | 5 lines 386.7 - 386.8 -On reporting a route error, also include the status for the error, 386.9 -rather than indicating a status of 0 when an error has occurred. 386.10 - 386.11 -Signed-off-by: Sean Hefty <sean.hefty@intel.com> 386.12 - 386.13 -------------------------------------------------------------------------
387.1 --- a/en/examples/template.svnstyle.simplest.out Mon Mar 09 21:13:56 2009 -0700 387.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 387.3 @@ -1,4 +0,0 @@ 387.4 -$ \textbf{cat svn.style} 387.5 -changeset = "\{node|short\}\textbackslash{}n" 387.6 -$ \textbf{hg log -r1 --style svn.style} 387.7 -
388.1 --- a/en/examples/template.svnstyle.style.out Mon Mar 09 21:13:56 2009 -0700 388.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 388.3 @@ -1,3 +0,0 @@ 388.4 -$ \textbf{cat svn.style} 388.5 -header = '------------------------------------------------------------------------\textbackslash{}n\textbackslash{}n' 388.6 -changeset = svn.template
389.1 --- a/en/examples/template.svnstyle.syntax.error.out Mon Mar 09 21:13:56 2009 -0700 389.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 389.3 @@ -1,2 +0,0 @@ 389.4 -$ \textbf{hg log -r1 --style broken.style} 389.5 -abort: broken.style:1: parse error
390.1 --- a/en/examples/template.svnstyle.syntax.input.out Mon Mar 09 21:13:56 2009 -0700 390.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 390.3 @@ -1,2 +0,0 @@ 390.4 -$ \textbf{cat broken.style} 390.5 -changeset =
391.1 --- a/en/examples/template.svnstyle.template.out Mon Mar 09 21:13:56 2009 -0700 391.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 391.3 @@ -1,6 +0,0 @@ 391.4 -$ \textbf{cat svn.template} 391.5 -r\{rev\} | \{author|user\} | \{date|isodate\} (\{date|rfc822date\}) 391.6 - 391.7 -\{desc|strip|fill76\} 391.8 - 391.9 -------------------------------------------------------------------------
392.1 --- a/en/examples/tour-merge-conflict.commit.out Mon Mar 09 21:13:56 2009 -0700 392.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 392.3 @@ -1,16 +0,0 @@ 392.4 -$ \textbf{cat > letter.txt <<EOF} 392.5 -> \textbf{Greetings!} 392.6 -> \textbf{I am Bryan O'Sullivan, no relation of the former} 392.7 -> \textbf{Nigerian dictator Sani Abacha.} 392.8 -> \textbf{EOF} 392.9 -$ \textbf{hg resolve -m letter.txt} 392.10 -$ \textbf{hg commit -m 'Send me your money'} 392.11 -$ \textbf{hg tip} 392.12 -changeset: 392.13 -tag: tip 392.14 -parent: 392.15 -parent: 392.16 -user: Bryan O'Sullivan <bos@serpentine.com> 392.17 - 392.18 -summary: Send me your money 392.19 -
393.1 --- a/en/examples/tour-merge-conflict.cousin.out Mon Mar 09 21:13:56 2009 -0700 393.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 393.3 @@ -1,11 +0,0 @@ 393.4 -$ \textbf{cd ..} 393.5 -$ \textbf{hg clone scam scam-cousin} 393.6 -updating working directory 393.7 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 393.8 -$ \textbf{cd scam-cousin} 393.9 -$ \textbf{cat > letter.txt <<EOF} 393.10 -> \textbf{Greetings!} 393.11 -> \textbf{I am Shehu Musa Abacha, cousin to the former} 393.12 -> \textbf{Nigerian dictator Sani Abacha.} 393.13 -> \textbf{EOF} 393.14 -$ \textbf{hg commit -m '419 scam, with cousin'}
394.1 --- a/en/examples/tour-merge-conflict.merge.out Mon Mar 09 21:13:56 2009 -0700 394.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 394.3 @@ -1,17 +0,0 @@ 394.4 -$ \textbf{export HGMERGE=merge} 394.5 -$ \textbf{echo 'XXX this is broken and must be fixed'} 394.6 -XXX this is broken and must be fixed 394.7 -$ \textbf{hg merge} 394.8 -merging letter.txt 394.9 -merge: warning: conflicts during merge 394.10 -merging letter.txt failed! 394.11 -0 files updated, 0 files merged, 0 files removed, 1 files unresolved 394.12 -use 'hg resolve' to retry unresolved file merges 394.13 -$ \textbf{cat letter.txt} 394.14 -Greetings! 394.15 - 394.16 -I am Shehu Musa Abacha, cousin to the former 394.17 -======= 394.18 -I am Alhaji Abba Abacha, son of the former 394.19 - 394.20 -Nigerian dictator Sani Abacha.
395.1 --- a/en/examples/tour-merge-conflict.pull.out Mon Mar 09 21:13:56 2009 -0700 395.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 395.3 @@ -1,14 +0,0 @@ 395.4 -$ \textbf{cd ..} 395.5 -$ \textbf{hg clone scam-cousin scam-merge} 395.6 -updating working directory 395.7 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 395.8 -$ \textbf{cd scam-merge} 395.9 -$ \textbf{hg pull -u ../scam-son} 395.10 -pulling from ../scam-son 395.11 -searching for changes 395.12 -adding changesets 395.13 -adding manifests 395.14 -adding file changes 395.15 -added 1 changesets with 1 changes to 1 files (+1 heads) 395.16 -not updating, since new heads added 395.17 -(run 'hg heads' to see heads, 'hg merge' to merge)
396.1 --- a/en/examples/tour-merge-conflict.son.out Mon Mar 09 21:13:56 2009 -0700 396.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 396.3 @@ -1,11 +0,0 @@ 396.4 -$ \textbf{cd ..} 396.5 -$ \textbf{hg clone scam scam-son} 396.6 -updating working directory 396.7 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 396.8 -$ \textbf{cd scam-son} 396.9 -$ \textbf{cat > letter.txt <<EOF} 396.10 -> \textbf{Greetings!} 396.11 -> \textbf{I am Alhaji Abba Abacha, son of the former} 396.12 -> \textbf{Nigerian dictator Sani Abacha.} 396.13 -> \textbf{EOF} 396.14 -$ \textbf{hg commit -m '419 scam, with son'}
397.1 --- a/en/examples/tour-merge-conflict.wife.out Mon Mar 09 21:13:56 2009 -0700 397.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 397.3 @@ -1,7 +0,0 @@ 397.4 -$ \textbf{cat > letter.txt <<EOF} 397.5 -> \textbf{Greetings!} 397.6 -> \textbf{I am Mariam Abacha, the wife of former} 397.7 -> \textbf{Nigerian dictator Sani Abacha.} 397.8 -> \textbf{EOF} 397.9 -$ \textbf{hg add letter.txt} 397.10 -$ \textbf{hg commit -m '419 scam, first draft'}
398.1 --- a/en/examples/tour.clone-pull.out Mon Mar 09 21:13:56 2009 -0700 398.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 398.3 @@ -1,4 +0,0 @@ 398.4 -$ \textbf{cd ..} 398.5 -$ \textbf{hg clone hello hello-pull} 398.6 -updating working directory 398.7 -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
399.1 --- a/en/examples/tour.clone-push.out Mon Mar 09 21:13:56 2009 -0700 399.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 399.3 @@ -1,4 +0,0 @@ 399.4 -$ \textbf{cd ..} 399.5 -$ \textbf{hg clone hello hello-push} 399.6 -updating working directory 399.7 -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
400.1 --- a/en/examples/tour.clone.out Mon Mar 09 21:13:56 2009 -0700 400.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 400.3 @@ -1,9 +0,0 @@ 400.4 -$ \textbf{hg clone http://hg.serpentine.com/tutorial/hello} 400.5 -destination directory: hello 400.6 -requesting all changes 400.7 -adding changesets 400.8 -adding manifests 400.9 -adding file changes 400.10 -added 5 changesets with 5 changes to 2 files 400.11 -updating working directory 400.12 -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
401.1 --- a/en/examples/tour.commit.out Mon Mar 09 21:13:56 2009 -0700 401.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 401.3 @@ -1,1 +0,0 @@ 401.4 -$ \textbf{hg commit}
402.1 --- a/en/examples/tour.diff.out Mon Mar 09 21:13:56 2009 -0700 402.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 402.3 @@ -1,11 +0,0 @@ 402.4 -$ \textbf{hg diff} 402.5 -diff -r hello.c 402.6 - 402.7 - 402.8 -@@ -8,5 +8,6 @@ 402.9 - int main(int argc, char **argv) 402.10 - \{ 402.11 - printf("hello, world!\textbackslash{}"); 402.12 -+ printf("hello again!\textbackslash{}n"); 402.13 - return 0; 402.14 - \}
403.1 --- a/en/examples/tour.help.out Mon Mar 09 21:13:56 2009 -0700 403.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 403.3 @@ -1,19 +0,0 @@ 403.4 -$ \textbf{hg help init} 403.5 -hg init [-e CMD] [--remotecmd CMD] [DEST] 403.6 - 403.7 -create a new repository in the given directory 403.8 - 403.9 - Initialize a new repository in the given directory. If the given 403.10 - directory does not exist, it is created. 403.11 - 403.12 - If no directory is given, the current directory is used. 403.13 - 403.14 - It is possible to specify an ssh:// URL as the destination. 403.15 - See 'hg help urls' for more information. 403.16 - 403.17 -options: 403.18 - 403.19 - -e --ssh specify ssh command to use 403.20 - --remotecmd specify hg command to run on the remote side 403.21 - 403.22 -use "hg -v help init" to show global options
404.1 --- a/en/examples/tour.incoming.out Mon Mar 09 21:13:56 2009 -0700 404.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 404.3 @@ -1,10 +0,0 @@ 404.4 -$ \textbf{cd hello-pull} 404.5 -$ \textbf{hg incoming ../my-hello} 404.6 -comparing with ../my-hello 404.7 -searching for changes 404.8 -changeset: 404.9 -tag: tip 404.10 -user: Bryan O'Sullivan <bos@serpentine.com> 404.11 - 404.12 -summary: Added an extra line of output 404.13 -
405.1 --- a/en/examples/tour.log-r.out Mon Mar 09 21:13:56 2009 -0700 405.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 405.3 @@ -1,24 +0,0 @@ 405.4 -$ \textbf{hg log -r 3} 405.5 -changeset: 405.6 -user: Bryan O'Sullivan <bos@serpentine.com> 405.7 - 405.8 -summary: Get make to generate the final binary from a .o file. 405.9 - 405.10 -$ \textbf{hg log -r } 405.11 -changeset: 405.12 -user: Bryan O'Sullivan <bos@serpentine.com> 405.13 - 405.14 -summary: Get make to generate the final binary from a .o file. 405.15 - 405.16 -$ \textbf{hg log -r 1 -r 4} 405.17 -changeset: 405.18 -user: mpm@selenic.com 405.19 - 405.20 -summary: Create a makefile 405.21 - 405.22 -changeset: 405.23 -tag: tip 405.24 -user: Bryan O'Sullivan <bos@serpentine.com> 405.25 - 405.26 -summary: Trim comments. 405.27 -
406.1 --- a/en/examples/tour.log-v.out Mon Mar 09 21:13:56 2009 -0700 406.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 406.3 @@ -1,9 +0,0 @@ 406.4 -$ \textbf{hg log -v -r 3} 406.5 -changeset: 406.6 -user: Bryan O'Sullivan <bos@serpentine.com> 406.7 - 406.8 -files: Makefile 406.9 -description: 406.10 -Get make to generate the final binary from a .o file. 406.11 - 406.12 -
407.1 --- a/en/examples/tour.log-vp.out Mon Mar 09 21:13:56 2009 -0700 407.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 407.3 @@ -1,21 +0,0 @@ 407.4 -$ \textbf{hg log -v -p -r 2} 407.5 -changeset: 407.6 -user: Bryan O'Sullivan <bos@serpentine.com> 407.7 - 407.8 -files: hello.c 407.9 -description: 407.10 -Introduce a typo into hello.c. 407.11 - 407.12 - 407.13 -diff -r -r hello.c 407.14 - 407.15 - 407.16 -@@ -11,6 +11,6 @@ 407.17 - 407.18 - int main(int argc, char **argv) 407.19 - \{ 407.20 -- printf("hello, world!\textbackslash{}n"); 407.21 -+ printf("hello, world!\textbackslash{}"); 407.22 - return 0; 407.23 - \} 407.24 -
408.1 --- a/en/examples/tour.log.out Mon Mar 09 21:13:56 2009 -0700 408.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 408.3 @@ -1,27 +0,0 @@ 408.4 -$ \textbf{hg log} 408.5 -changeset: 408.6 -tag: tip 408.7 -user: Bryan O'Sullivan <bos@serpentine.com> 408.8 - 408.9 -summary: Trim comments. 408.10 - 408.11 -changeset: 408.12 -user: Bryan O'Sullivan <bos@serpentine.com> 408.13 - 408.14 -summary: Get make to generate the final binary from a .o file. 408.15 - 408.16 -changeset: 408.17 -user: Bryan O'Sullivan <bos@serpentine.com> 408.18 - 408.19 -summary: Introduce a typo into hello.c. 408.20 - 408.21 -changeset: 408.22 -user: mpm@selenic.com 408.23 - 408.24 -summary: Create a makefile 408.25 - 408.26 -changeset: 408.27 -user: mpm@selenic.com 408.28 - 408.29 -summary: Create a standard "hello, world" program 408.30 -
409.1 --- a/en/examples/tour.log.range.out Mon Mar 09 21:13:56 2009 -0700 409.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 409.3 @@ -1,17 +0,0 @@ 409.4 -$ \textbf{hg log -r 2:4} 409.5 -changeset: 409.6 -user: Bryan O'Sullivan <bos@serpentine.com> 409.7 - 409.8 -summary: Introduce a typo into hello.c. 409.9 - 409.10 -changeset: 409.11 -user: Bryan O'Sullivan <bos@serpentine.com> 409.12 - 409.13 -summary: Get make to generate the final binary from a .o file. 409.14 - 409.15 -changeset: 409.16 -tag: tip 409.17 -user: Bryan O'Sullivan <bos@serpentine.com> 409.18 - 409.19 -summary: Trim comments. 409.20 -
410.1 --- a/en/examples/tour.ls-a.out Mon Mar 09 21:13:56 2009 -0700 410.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 410.3 @@ -1,3 +0,0 @@ 410.4 -$ \textbf{cd hello} 410.5 -$ \textbf{ls -a} 410.6 -. .. .hg Makefile hello.c
411.1 --- a/en/examples/tour.ls.out Mon Mar 09 21:13:56 2009 -0700 411.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 411.3 @@ -1,5 +0,0 @@ 411.4 -$ \textbf{ls -l} 411.5 - 411.6 - 411.7 -$ \textbf{ls hello} 411.8 -Makefile hello.c
412.1 --- a/en/examples/tour.merge.cat.out Mon Mar 09 21:13:56 2009 -0700 412.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 412.3 @@ -1,28 +0,0 @@ 412.4 -$ \textbf{cat hello.c} 412.5 -/* 412.6 - * Placed in the public domain by Bryan O'Sullivan. This program is 412.7 - * not covered by patents in the United States or other countries. 412.8 - */ 412.9 - 412.10 -#include <stdio.h> 412.11 - 412.12 -int main(int argc, char **argv) 412.13 -\{ 412.14 - printf("once more, hello.\textbackslash{}n"); 412.15 - printf("hello, world!\textbackslash{}"); 412.16 - return 0; 412.17 -\} 412.18 -$ \textbf{cat ../my-hello/hello.c} 412.19 -/* 412.20 - * Placed in the public domain by Bryan O'Sullivan. This program is 412.21 - * not covered by patents in the United States or other countries. 412.22 - */ 412.23 - 412.24 -#include <stdio.h> 412.25 - 412.26 -int main(int argc, char **argv) 412.27 -\{ 412.28 - printf("hello, world!\textbackslash{}"); 412.29 - printf("hello again!\textbackslash{}n"); 412.30 - return 0; 412.31 -\}
413.1 --- a/en/examples/tour.merge.clone.out Mon Mar 09 21:13:56 2009 -0700 413.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 413.3 @@ -1,7 +0,0 @@ 413.4 -$ \textbf{cd ..} 413.5 -$ \textbf{hg clone hello my-new-hello} 413.6 -updating working directory 413.7 -2 files updated, 0 files merged, 0 files removed, 0 files unresolved 413.8 -$ \textbf{cd my-new-hello} 413.9 -$ \textbf{sed -i '/printf/i\textbackslash{}\textbackslash{}tprintf("once more, hello.\textbackslash{}\textbackslash{}n");' hello.c} 413.10 -$ \textbf{hg commit -m 'A new hello for a new day.'}
414.1 --- a/en/examples/tour.merge.commit.out Mon Mar 09 21:13:56 2009 -0700 414.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 414.3 @@ -1,1 +0,0 @@ 414.4 -$ \textbf{hg commit -m 'Merged changes'}
415.1 --- a/en/examples/tour.merge.heads.out Mon Mar 09 21:13:56 2009 -0700 415.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 415.3 @@ -1,13 +0,0 @@ 415.4 -$ \textbf{hg heads} 415.5 -changeset: 415.6 -tag: tip 415.7 -parent: 415.8 -user: Bryan O'Sullivan <bos@serpentine.com> 415.9 - 415.10 -summary: Added an extra line of output 415.11 - 415.12 -changeset: 415.13 -user: Bryan O'Sullivan <bos@serpentine.com> 415.14 - 415.15 -summary: A new hello for a new day. 415.16 -
416.1 --- a/en/examples/tour.merge.merge.out Mon Mar 09 21:13:56 2009 -0700 416.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 416.3 @@ -1,4 +0,0 @@ 416.4 -$ \textbf{hg merge} 416.5 -merging hello.c 416.6 -0 files updated, 1 files merged, 0 files removed, 0 files unresolved 416.7 -(branch merge, don't forget to commit)
417.1 --- a/en/examples/tour.merge.parents.out Mon Mar 09 21:13:56 2009 -0700 417.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 417.3 @@ -1,28 +0,0 @@ 417.4 -$ \textbf{hg parents} 417.5 -changeset: 417.6 -user: Bryan O'Sullivan <bos@serpentine.com> 417.7 - 417.8 -summary: A new hello for a new day. 417.9 - 417.10 -changeset: 417.11 -tag: tip 417.12 -parent: 417.13 -user: Bryan O'Sullivan <bos@serpentine.com> 417.14 - 417.15 -summary: Added an extra line of output 417.16 - 417.17 -$ \textbf{cat hello.c} 417.18 -/* 417.19 - * Placed in the public domain by Bryan O'Sullivan. This program is 417.20 - * not covered by patents in the United States or other countries. 417.21 - */ 417.22 - 417.23 -#include <stdio.h> 417.24 - 417.25 -int main(int argc, char **argv) 417.26 -\{ 417.27 - printf("once more, hello.\textbackslash{}n"); 417.28 - printf("hello, world!\textbackslash{}"); 417.29 - printf("hello again!\textbackslash{}n"); 417.30 - return 0; 417.31 -\}
418.1 --- a/en/examples/tour.merge.pull.out Mon Mar 09 21:13:56 2009 -0700 418.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 418.3 @@ -1,8 +0,0 @@ 418.4 -$ \textbf{hg pull ../my-hello} 418.5 -pulling from ../my-hello 418.6 -searching for changes 418.7 -adding changesets 418.8 -adding manifests 418.9 -adding file changes 418.10 -added 1 changesets with 1 changes to 1 files (+1 heads) 418.11 -(run 'hg heads' to see heads, 'hg merge' to merge)
419.1 --- a/en/examples/tour.merge.tip.out Mon Mar 09 21:13:56 2009 -0700 419.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 419.3 @@ -1,9 +0,0 @@ 419.4 -$ \textbf{hg tip} 419.5 -changeset: 419.6 -tag: tip 419.7 -parent: 419.8 -parent: 419.9 -user: Bryan O'Sullivan <bos@serpentine.com> 419.10 - 419.11 -summary: Merged changes 419.12 -
420.1 --- a/en/examples/tour.merge.update.out Mon Mar 09 21:13:56 2009 -0700 420.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 420.3 @@ -1,2 +0,0 @@ 420.4 -$ \textbf{hg update} 420.5 -abort: crosses branches (use 'hg merge' or 'hg update -C')
421.1 --- a/en/examples/tour.older.out Mon Mar 09 21:13:56 2009 -0700 421.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 421.3 @@ -1,10 +0,0 @@ 421.4 -$ \textbf{hg update 2} 421.5 -2 files updated, 0 files merged, 0 files removed, 0 files unresolved 421.6 -$ \textbf{hg parents} 421.7 -changeset: 421.8 -user: Bryan O'Sullivan <bos@serpentine.com> 421.9 - 421.10 -summary: Introduce a typo into hello.c. 421.11 - 421.12 -$ \textbf{hg update} 421.13 -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
422.1 --- a/en/examples/tour.outgoing.net.out Mon Mar 09 21:13:56 2009 -0700 422.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 422.3 @@ -1,9 +0,0 @@ 422.4 -$ \textbf{hg outgoing http://hg.serpentine.com/tutorial/hello} 422.5 -comparing with http://hg.serpentine.com/tutorial/hello 422.6 -searching for changes 422.7 -changeset: 422.8 -tag: tip 422.9 -user: Bryan O'Sullivan <bos@serpentine.com> 422.10 - 422.11 -summary: Added an extra line of output 422.12 -
423.1 --- a/en/examples/tour.outgoing.out Mon Mar 09 21:13:56 2009 -0700 423.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 423.3 @@ -1,10 +0,0 @@ 423.4 -$ \textbf{cd my-hello} 423.5 -$ \textbf{hg outgoing ../hello-push} 423.6 -comparing with ../hello-push 423.7 -searching for changes 423.8 -changeset: 423.9 -tag: tip 423.10 -user: Bryan O'Sullivan <bos@serpentine.com> 423.11 - 423.12 -summary: Added an extra line of output 423.13 -
424.1 --- a/en/examples/tour.parents.out Mon Mar 09 21:13:56 2009 -0700 424.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 424.3 @@ -1,7 +0,0 @@ 424.4 -$ \textbf{hg parents} 424.5 -changeset: 424.6 -tag: tip 424.7 -user: Bryan O'Sullivan <bos@serpentine.com> 424.8 - 424.9 -summary: Added an extra line of output 424.10 -
425.1 --- a/en/examples/tour.pull.out Mon Mar 09 21:13:56 2009 -0700 425.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 425.3 @@ -1,22 +0,0 @@ 425.4 -$ \textbf{hg tip} 425.5 -changeset: 425.6 -tag: tip 425.7 -user: Bryan O'Sullivan <bos@serpentine.com> 425.8 - 425.9 -summary: Trim comments. 425.10 - 425.11 -$ \textbf{hg pull ../my-hello} 425.12 -pulling from ../my-hello 425.13 -searching for changes 425.14 -adding changesets 425.15 -adding manifests 425.16 -adding file changes 425.17 -added 1 changesets with 1 changes to 1 files 425.18 -(run 'hg update' to get a working copy) 425.19 -$ \textbf{hg tip} 425.20 -changeset: 425.21 -tag: tip 425.22 -user: Bryan O'Sullivan <bos@serpentine.com> 425.23 - 425.24 -summary: Added an extra line of output 425.25 -
426.1 --- a/en/examples/tour.push.net.out Mon Mar 09 21:13:56 2009 -0700 426.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 426.3 @@ -1,4 +0,0 @@ 426.4 -$ \textbf{hg push http://hg.serpentine.com/tutorial/hello} 426.5 -pushing to http://hg.serpentine.com/tutorial/hello 426.6 -searching for changes 426.7 -ssl required
427.1 --- a/en/examples/tour.push.nothing.out Mon Mar 09 21:13:56 2009 -0700 427.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 427.3 @@ -1,4 +0,0 @@ 427.4 -$ \textbf{hg push ../hello-push} 427.5 -pushing to ../hello-push 427.6 -searching for changes 427.7 -no changes found
428.1 --- a/en/examples/tour.push.out Mon Mar 09 21:13:56 2009 -0700 428.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 428.3 @@ -1,7 +0,0 @@ 428.4 -$ \textbf{hg push ../hello-push} 428.5 -pushing to ../hello-push 428.6 -searching for changes 428.7 -adding changesets 428.8 -adding manifests 428.9 -adding file changes 428.10 -added 1 changesets with 1 changes to 1 files
429.1 --- a/en/examples/tour.reclone.out Mon Mar 09 21:13:56 2009 -0700 429.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 429.3 @@ -1,5 +0,0 @@ 429.4 -$ \textbf{cd ..} 429.5 -$ \textbf{hg clone hello my-hello} 429.6 -updating working directory 429.7 -2 files updated, 0 files merged, 0 files removed, 0 files unresolved 429.8 -$ \textbf{cd my-hello}
430.1 --- a/en/examples/tour.sed.out Mon Mar 09 21:13:56 2009 -0700 430.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 430.3 @@ -1,1 +0,0 @@ 430.4 -$ \textbf{sed -i '/printf/a\textbackslash{}\textbackslash{}tprintf("hello again!\textbackslash{}\textbackslash{}n");' hello.c}
431.1 --- a/en/examples/tour.status.out Mon Mar 09 21:13:56 2009 -0700 431.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 431.3 @@ -1,4 +0,0 @@ 431.4 -$ \textbf{ls} 431.5 -Makefile hello.c 431.6 -$ \textbf{hg status} 431.7 -M hello.c
432.1 --- a/en/examples/tour.tip.out Mon Mar 09 21:13:56 2009 -0700 432.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 432.3 @@ -1,21 +0,0 @@ 432.4 -$ \textbf{hg tip -vp} 432.5 -changeset: 432.6 -tag: tip 432.7 -user: Bryan O'Sullivan <bos@serpentine.com> 432.8 - 432.9 -files: hello.c 432.10 -description: 432.11 -Added an extra line of output 432.12 - 432.13 - 432.14 -diff -r -r hello.c 432.15 - 432.16 - 432.17 -@@ -8,5 +8,6 @@ 432.18 - int main(int argc, char **argv) 432.19 - \{ 432.20 - printf("hello, world!\textbackslash{}"); 432.21 -+ printf("hello again!\textbackslash{}n"); 432.22 - return 0; 432.23 - \} 432.24 -
433.1 --- a/en/examples/tour.update.out Mon Mar 09 21:13:56 2009 -0700 433.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 433.3 @@ -1,7 +0,0 @@ 433.4 -$ \textbf{grep printf hello.c} 433.5 - printf("hello, world!\textbackslash{}"); 433.6 -$ \textbf{hg update tip} 433.7 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 433.8 -$ \textbf{grep printf hello.c} 433.9 - printf("hello, world!\textbackslash{}"); 433.10 - printf("hello again!\textbackslash{}n");
434.1 --- a/en/examples/tour.version.out Mon Mar 09 21:13:56 2009 -0700 434.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 434.3 @@ -1,6 +0,0 @@ 434.4 -$ \textbf{hg version} 434.5 -Mercurial Distributed SCM (version ) 434.6 - 434.7 -Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others 434.8 -This is free software; see the source for copying conditions. There is NO 434.9 -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.