# HG changeset patch # User Bryan O'Sullivan # Date 1238527141 25200 # Node ID 4432ad34b8e5017faeb57cf0cbeed48d9a3ea32a # Parent c82ff69f0935062cbf1820d3896e1f554a4262af Check in example outputs with begin/end markers. diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/backout.init.out --- a/en/examples/results/backout.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg init myrepo $ cd myrepo $ echo first change >> myfile @@ -6,3 +7,4 @@ $ echo second change >> myfile $ hg commit -m 'second change' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/backout.manual.backout.out --- a/en/examples/results/backout.manual.backout.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.manual.backout.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ echo third change >> myfile $ hg commit -m 'third change' $ hg backout -m 'back out second change' 1 @@ -7,3 +8,4 @@ the backout changeset is a new head - do not forget to merge (use "backout --merge" if you want to auto-merge) + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/backout.manual.cat.out --- a/en/examples/results/backout.manual.cat.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.manual.cat.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ cat myfile first change second change third change + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/backout.manual.clone.out --- a/en/examples/results/backout.manual.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.manual.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd .. $ hg clone -r1 myrepo newrepo requesting all changes @@ -9,3 +10,4 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd newrepo + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/backout.manual.heads.out --- a/en/examples/results/backout.manual.heads.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.manual.heads.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg heads changeset: tag: tip @@ -12,3 +13,4 @@ summary: third change + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/backout.manual.log.out --- a/en/examples/results/backout.manual.log.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.manual.log.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,14 +1,16 @@ + $ hg log --style compact -3[tip]:1 2009-03-10 04:37 +0000 bos +3[tip]:1 2009-03-31 19:08 +0000 bos back out second change -2 2009-03-10 04:37 +0000 bos +2 2009-03-31 19:08 +0000 bos third change -1 2009-03-10 04:37 +0000 bos +1 2009-03-31 19:08 +0000 bos second change -0 2009-03-10 04:37 +0000 bos +0 2009-03-31 19:08 +0000 bos first change + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/backout.manual.merge.out --- a/en/examples/results/backout.manual.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.manual.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg merge merging myfile 0 files updated, 1 files merged, 0 files removed, 0 files unresolved @@ -7,3 +8,4 @@ first change third change + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/backout.manual.parents.out --- a/en/examples/results/backout.manual.parents.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.manual.parents.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg parents changeset: user: Bryan O'Sullivan <bos@serpentine.com> @@ -5,3 +6,4 @@ summary: third change + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/backout.non-tip.backout.out --- a/en/examples/results/backout.non-tip.backout.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.non-tip.backout.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ echo third change >> myfile $ hg commit -m 'third change' $ hg backout --merge -m 'back out second change' 1 @@ -9,3 +10,4 @@ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/backout.non-tip.cat.out --- a/en/examples/results/backout.non-tip.cat.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.non-tip.cat.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ cat myfile first change third change + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/backout.non-tip.clone.out --- a/en/examples/results/backout.non-tip.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.non-tip.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd .. $ hg clone -r1 myrepo non-tip-repo requesting all changes @@ -9,3 +10,4 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd non-tip-repo + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/backout.simple.log.out --- a/en/examples/results/backout.simple.log.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.simple.log.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,11 +1,13 @@ + $ hg log --style compact -2[tip] 2009-03-10 04:37 +0000 bos +2[tip] 2009-03-31 19:08 +0000 bos back out second change -1 2009-03-10 04:37 +0000 bos +1 2009-03-31 19:08 +0000 bos second change -0 2009-03-10 04:37 +0000 bos +0 2009-03-31 19:08 +0000 bos first change + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/backout.simple.out --- a/en/examples/results/backout.simple.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/backout.simple.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ + $ hg backout -m 'back out second change' tip reverting myfile changeset backs out changeset $ cat myfile first change + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/bisect.commits.out --- a/en/examples/results/bisect.commits.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.commits.out Tue Mar 31 12:19:01 2009 -0700 @@ -9,3 +9,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/bisect.help.out --- a/en/examples/results/bisect.help.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.help.out Tue Mar 31 12:19:01 2009 -0700 @@ -32,3 +32,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/bisect.init.out --- a/en/examples/results/bisect.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/bisect.search.bad-init.out --- a/en/examples/results/bisect.search.bad-init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.bad-init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/bisect.search.good-init.out --- a/en/examples/results/bisect.search.good-init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.good-init.out Tue Mar 31 12:19:01 2009 -0700 @@ -3,3 +3,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/bisect.search.init.out --- a/en/examples/results/bisect.search.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/bisect.search.mytest.out --- a/en/examples/results/bisect.search.mytest.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.mytest.out Tue Mar 31 12:19:01 2009 -0700 @@ -9,3 +9,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/bisect.search.reset.out --- a/en/examples/results/bisect.search.reset.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.reset.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/bisect.search.rest.out --- a/en/examples/results/bisect.search.rest.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.rest.out Tue Mar 31 12:19:01 2009 -0700 @@ -18,3 +18,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/bisect.search.step1.out --- a/en/examples/results/bisect.search.step1.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.step1.out Tue Mar 31 12:19:01 2009 -0700 @@ -10,3 +10,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/bisect.search.step2.out --- a/en/examples/results/bisect.search.step2.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/bisect.search.step2.out Tue Mar 31 12:19:01 2009 -0700 @@ -4,3 +4,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-named.branch.out --- a/en/examples/results/branch-named.branch.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.branch.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ hg branch default + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-named.branches.out --- a/en/examples/results/branch-named.branches.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.branches.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg tip changeset: tag: tip @@ -8,3 +9,4 @@ $ hg branches default + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-named.commit.out --- a/en/examples/results/branch-named.commit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.commit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ echo 'hello again' >> myfile $ hg commit -m 'Second commit' $ hg tip @@ -9,3 +10,4 @@ summary: Second commit + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-named.create.out --- a/en/examples/results/branch-named.create.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.create.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ hg branch foo marked working directory as branch foo $ hg branch foo + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-named.foo-commit.out --- a/en/examples/results/branch-named.foo-commit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.foo-commit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ echo something > somefile $ hg commit -A -m 'New file' adding somefile @@ -18,3 +19,4 @@ summary: Third commit + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-named.merge.out --- a/en/examples/results/branch-named.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg branch bar $ hg merge foo @@ -15,3 +16,4 @@ summary: Merge + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-named.parents.out --- a/en/examples/results/branch-named.parents.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.parents.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg parents changeset: branch: bar @@ -11,3 +12,4 @@ foo (inactive) default (inactive) + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-named.rebranch.out --- a/en/examples/results/branch-named.rebranch.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.rebranch.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg branch foo $ hg branch bar @@ -14,3 +15,4 @@ summary: Third commit + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-named.status.out --- a/en/examples/results/branch-named.status.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.status.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg status $ hg tip changeset: @@ -7,3 +8,4 @@ summary: Initial commit + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-named.update-bar.out --- a/en/examples/results/branch-named.update-bar.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.update-bar.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ hg update bar 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-named.update-nothing.out --- a/en/examples/results/branch-named.update-nothing.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.update-nothing.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ hg update foo 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg update 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-named.update-switchy.out --- a/en/examples/results/branch-named.update-switchy.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-named.update-switchy.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg update foo 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg parents @@ -18,3 +19,4 @@ summary: Third commit + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-repo.bugfix.out --- a/en/examples/results/branch-repo.bugfix.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-repo.bugfix.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg clone myproject-1.0.1 my-1.0.1-bugfix updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -12,3 +13,4 @@ adding file changes added 1 changesets with 1 changes to 1 files + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-repo.clone.out --- a/en/examples/results/branch-repo.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-repo.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ cd .. $ hg clone myproject myproject-1.0.1 updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-repo.merge.out --- a/en/examples/results/branch-repo.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-repo.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -10,3 +11,4 @@ adding file changes added 2 changesets with 1 changes to 1 files + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-repo.new.out --- a/en/examples/results/branch-repo.new.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-repo.new.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd .. $ hg clone myproject my-feature updating working directory @@ -14,3 +15,4 @@ adding file changes added 1 changesets with 1 changes to 1 files + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-repo.pull.out --- a/en/examples/results/branch-repo.pull.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-repo.pull.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd .. $ hg clone myproject myproject-merge updating working directory @@ -12,3 +13,4 @@ added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branch-repo.tag.out --- a/en/examples/results/branch-repo.tag.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branch-repo.tag.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ cd myproject $ hg tag v1.0 + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branching.clone.out --- a/en/examples/results/branching.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branching.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd .. $ hg clone -rv1.0 main stable requesting all changes @@ -8,3 +9,4 @@ updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branching.init.out --- a/en/examples/results/branching.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branching.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ + $ hg init main $ cd main $ echo 'This is a boring feature.' > myfile $ hg commit -A -m 'We have reached an important milestone!' adding myfile + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branching.main.out --- a/en/examples/results/branching.main.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branching.main.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd ../main $ echo 'This is exciting and new!' >> myfile $ hg commit -m 'Add a new feature' @@ -5,3 +6,4 @@ This is a boring feature. This is exciting and new! + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branching.merge.out --- a/en/examples/results/branching.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branching.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd ../main $ hg pull ../stable pulling from ../stable @@ -16,3 +17,4 @@ This is a fix to a boring feature. This is exciting and new! + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branching.stable.out --- a/en/examples/results/branching.stable.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branching.stable.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg clone stable stable-fix updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -12,3 +13,4 @@ adding file changes added 1 changesets with 1 changes to 1 files + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branching.tag.out --- a/en/examples/results/branching.tag.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branching.tag.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg tag v1.0 $ hg tip changeset: @@ -10,3 +11,4 @@ tip v1.0 + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/branching.update.out --- a/en/examples/results/branching.update.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/branching.update.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd .. $ hg clone -U main main-old $ cd main-old @@ -6,3 +7,4 @@ $ cat myfile This is a boring feature. + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/cmdref.diff-p.out --- a/en/examples/results/cmdref.diff-p.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/cmdref.diff-p.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ echo '[diff]' >> $HGRC $ echo 'showfunc = False' >> $HGRC $ hg diff @@ -21,3 +22,4 @@ + return 10; } + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.copy.after.out --- a/en/examples/results/daily.copy.after.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.after.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ cp a z $ hg copy --after a z + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.copy.cat.out --- a/en/examples/results/daily.copy.cat.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.cat.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ + $ cat file line new contents $ cat ../my-copy/new-file line + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.copy.clone.out --- a/en/examples/results/daily.copy.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ cd .. $ hg clone my-copy your-copy updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.copy.copy.out --- a/en/examples/results/daily.copy.copy.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.copy.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ cd my-copy $ hg copy file new-file + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.copy.dir-dest.out --- a/en/examples/results/daily.copy.dir-dest.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.dir-dest.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ mkdir d $ hg copy a b d $ ls d a b + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.copy.dir-src-dest.out --- a/en/examples/results/daily.copy.dir-src-dest.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.dir-src-dest.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ hg copy c d copying c/a/c to d/c/a/c + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.copy.dir-src.out --- a/en/examples/results/daily.copy.dir-src.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.dir-src.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ hg copy c e copying c/a/c to e/a/c + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.copy.init.out --- a/en/examples/results/daily.copy.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ + $ hg init my-copy $ cd my-copy $ echo line > file $ hg add file $ hg commit -m 'Added a file' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.copy.merge.out --- a/en/examples/results/daily.copy.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg pull ../my-copy pulling from ../my-copy searching for changes @@ -14,3 +15,4 @@ line new contents + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.copy.other.out --- a/en/examples/results/daily.copy.other.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.other.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ cd ../your-copy $ echo 'new contents' >> file $ hg commit -m 'Changed file' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.copy.simple.out --- a/en/examples/results/daily.copy.simple.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.simple.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ mkdir k $ hg copy a k $ ls k a + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.copy.status-copy.out --- a/en/examples/results/daily.copy.status-copy.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.status-copy.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ hg status -C A new-file file $ hg commit -m 'Copied file' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.copy.status.out --- a/en/examples/results/daily.copy.status.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.copy.status.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ hg status A new-file + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.files.add-dir.out --- a/en/examples/results/daily.files.add-dir.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.add-dir.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ mkdir b $ echo b > b/b $ echo c > b/c @@ -9,3 +10,4 @@ adding b/d/d $ hg commit -m 'Added all files in subdirectory' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.files.add.out --- a/en/examples/results/daily.files.add.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.add.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg init add-example $ cd add-example $ echo a > a @@ -9,3 +10,4 @@ $ hg commit -m 'Added one file' $ hg status + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.files.addremove.out --- a/en/examples/results/daily.files.addremove.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.addremove.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg init addremove-example $ cd addremove-example $ echo a > a @@ -6,3 +7,4 @@ adding a adding b + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.files.commit-addremove.out --- a/en/examples/results/daily.files.commit-addremove.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.commit-addremove.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ echo c > c $ hg commit -A -m 'Commit with addremove' adding c + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.files.hidden.out --- a/en/examples/results/daily.files.hidden.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.hidden.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg init hidden-example $ cd hidden-example $ mkdir empty @@ -13,3 +14,4 @@ empty $ ls tmp/empty + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.files.missing.out --- a/en/examples/results/daily.files.missing.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.missing.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg init missing-example $ cd missing-example $ echo a > a @@ -7,3 +8,4 @@ $ hg status ! a + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.files.recover-missing.out --- a/en/examples/results/daily.files.recover-missing.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.recover-missing.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ hg revert a $ cat a a $ hg status + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.files.remove-after.out --- a/en/examples/results/daily.files.remove-after.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.remove-after.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ hg remove --after a $ hg status R a + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.files.remove.out --- a/en/examples/results/daily.files.remove.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.files.remove.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg init remove-example $ cd remove-example $ echo a > a @@ -12,3 +13,4 @@ $ hg remove b removing b/b + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.rename.rename.out --- a/en/examples/results/daily.rename.rename.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.rename.rename.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,2 +1,4 @@ + $ hg rename a b + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.rename.status-copy.out --- a/en/examples/results/daily.rename.status-copy.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.rename.status-copy.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ hg status -C A b a R a + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.rename.status.out --- a/en/examples/results/daily.rename.status.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.rename.status.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ hg status A b R a + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.revert.add.out --- a/en/examples/results/daily.revert.add.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.add.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ echo oops > oops $ hg add oops $ hg status oops @@ -6,3 +7,4 @@ $ hg status ? oops + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.revert.copy.out --- a/en/examples/results/daily.revert.copy.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.copy.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ hg copy file new-file $ hg revert new-file $ hg status ? new-file + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.revert.missing.out --- a/en/examples/results/daily.revert.missing.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.missing.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ rm file $ hg status ! file @@ -5,3 +6,4 @@ $ ls file file + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.revert.modify.out --- a/en/examples/results/daily.revert.modify.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.modify.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cat file original content $ echo unwanted change >> file @@ -9,3 +10,4 @@ original content +unwanted change + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.revert.remove.out --- a/en/examples/results/daily.revert.remove.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.remove.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg remove file $ hg status R file @@ -6,3 +7,4 @@ $ ls file file + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.revert.rename-orig.out --- a/en/examples/results/daily.revert.rename-orig.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.rename-orig.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ hg revert file no changes needed to file $ hg status ? new-file + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.revert.rename.out --- a/en/examples/results/daily.revert.rename.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.rename.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ hg rename file new-file $ hg revert new-file $ hg status ? new-file + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.revert.status.out --- a/en/examples/results/daily.revert.status.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.status.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ + $ hg status ? file.orig $ cat file.orig original content unwanted change + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/daily.revert.unmodify.out --- a/en/examples/results/daily.revert.unmodify.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/daily.revert.unmodify.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ + $ hg status M file $ hg revert file $ cat file original content + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/extdiff.diff.out --- a/en/examples/results/extdiff.diff.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/extdiff.diff.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg diff diff -r myfile @@ -6,3 +7,4 @@ The first line. +The second line. + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/extdiff.extdiff-ctx.out --- a/en/examples/results/extdiff.extdiff-ctx.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/extdiff.extdiff-ctx.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg extdiff -o -NprcC5 @@ -7,3 +8,4 @@ The first line. + The second line. + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/extdiff.extdiff.out --- a/en/examples/results/extdiff.extdiff.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/extdiff.extdiff.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg extdiff @@ -5,3 +6,4 @@ The first line. +The second line. + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/filenames.dirs.out --- a/en/examples/results/filenames.dirs.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.dirs.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ + $ hg status src ? src/main.py ? src/watcher/_watcher.c ? src/watcher/watcher.py ? src/xyzzy.txt + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/filenames.files.out --- a/en/examples/results/filenames.files.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.files.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,2 +1,4 @@ + $ hg add COPYING README examples/simple.py + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/filenames.filter.exclude.out --- a/en/examples/results/filenames.filter.exclude.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.filter.exclude.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ hg status -X '**.py' src ? src/watcher/_watcher.c ? src/xyzzy.txt + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/filenames.filter.include.out --- a/en/examples/results/filenames.filter.include.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.filter.include.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ hg status -I '*.in' ? MANIFEST.in + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/filenames.glob.group.out --- a/en/examples/results/filenames.glob.group.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.glob.group.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ hg status 'glob:*.{in,py}' ? MANIFEST.in ? setup.py + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/filenames.glob.question.out --- a/en/examples/results/filenames.glob.question.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.glob.question.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ hg status 'glob:**.?' ? src/watcher/_watcher.c + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/filenames.glob.range.out --- a/en/examples/results/filenames.glob.range.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.glob.range.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ hg status 'glob:**[nr-t]' ? MANIFEST.in ? src/xyzzy.txt + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/filenames.glob.star-starstar.out --- a/en/examples/results/filenames.glob.star-starstar.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.glob.star-starstar.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg status 'glob:*.py' ? setup.py $ hg status 'glob:**.py' @@ -7,3 +8,4 @@ ? setup.py ? src/watcher/watcher.py + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/filenames.glob.star.out --- a/en/examples/results/filenames.glob.star.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.glob.star.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ hg add 'glob:*.py' adding main.py + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/filenames.glob.starstar.out --- a/en/examples/results/filenames.glob.starstar.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.glob.starstar.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd .. $ hg status 'glob:**.py' A examples/simple.py @@ -6,3 +7,4 @@ ? setup.py ? src/watcher/watcher.py + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/filenames.wdir-relname.out --- a/en/examples/results/filenames.wdir-relname.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.wdir-relname.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg status A COPYING A README @@ -21,3 +22,4 @@ ? watcher/watcher.py ? xyzzy.txt + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/filenames.wdir-subdir.out --- a/en/examples/results/filenames.wdir-subdir.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/filenames.wdir-subdir.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd src $ hg add -n adding ../MANIFEST.in @@ -13,3 +14,4 @@ adding watcher/watcher.py adding xyzzy.txt + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/hook.msglen.go.out --- a/en/examples/results/hook.msglen.go.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/hook.msglen.go.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cat .hg/hgrc [hooks] pretxncommit.msglen = test `hg tip --template {desc} | wc -c` -ge 10 @@ -9,3 +10,4 @@ abort: pretxncommit.msglen hook exited with status 1 $ hg commit -A -m 'long enough' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/hook.simple.ext.out --- a/en/examples/results/hook.simple.ext.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/hook.simple.ext.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ + $ echo 'commit.when = echo -n "date of commit: "; date' >> .hg/hgrc $ echo a >> a $ hg commit -m 'i have two hooks' committed + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/hook.simple.init.out --- a/en/examples/results/hook.simple.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/hook.simple.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg init hook-test $ cd hook-test $ echo '[hooks]' >> .hg/hgrc @@ -10,3 +11,4 @@ $ hg commit -m 'testing commit hook' committed + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/hook.simple.pretxncommit.out --- a/en/examples/results/hook.simple.pretxncommit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/hook.simple.pretxncommit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cat check_bug_id #!/bin/sh # check that a commit comment mentions a numeric bug id @@ -12,3 +13,4 @@ committed + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/hook.ws.better.out --- a/en/examples/results/hook.ws.better.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/hook.ws.better.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cat .hg/hgrc [hooks] pretxncommit.whitespace = .hg/check_whitespace.py @@ -16,3 +17,4 @@ rollback completed abort: pretxncommit.whitespace hook exited with status 1 + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/hook.ws.simple.out --- a/en/examples/results/hook.ws.simple.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/hook.ws.simple.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cat .hg/hgrc [hooks] pretxncommit.whitespace = hg export tip | (! egrep -q '^\+.*[ \t]$') @@ -10,3 +11,4 @@ $ echo 'a' > a $ hg commit -A -m 'drop trailing whitespace and try again' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/issue29.go.out --- a/en/examples/results/issue29.go.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/issue29.go.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg init issue29 $ cd issue29 $ echo a > a @@ -16,3 +17,4 @@ $ hg merge + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.dodiff.diff.out --- a/en/examples/results/mq.dodiff.diff.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.dodiff.diff.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ echo 'this is my original thought' > oldfile $ echo 'i have changed my mind' > newfile $ diff -u oldfile newfile > tiny.patch @@ -12,3 +13,4 @@ $ cat oldfile i have changed my mind + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.guards.init.out --- a/en/examples/results/mq.guards.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg qinit $ hg qnew hello.patch $ echo hello > hello @@ -8,3 +9,4 @@ $ hg add goodbye $ hg qrefresh + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.guards.qguard.neg.out --- a/en/examples/results/mq.guards.qguard.neg.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qguard.neg.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,30 @@ + $ hg qguard hello.patch -quux +hg qguard: option -u not recognized +hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]... + +set or print guards for a patch + + Guards control whether a patch can be pushed. A patch with no + guards is always pushed. A patch with a positive guard ("+foo") is + pushed only if the qselect command has activated it. A patch with + a negative guard ("-foo") is never pushed if the qselect command + has activated it. + + With no arguments, print the currently active guards. + With arguments, set guards for the named patch. + NOTE: Specifying negative guards now requires '--'. + + To set guards on another patch: + hg qguard -- other.patch +2.6.17 -stable + +options: + + -l --list list all patches and guards + -n --none drop all guards + +use "hg -v help qguard" to show global options $ hg qguard hello.patch -hello.patch: -quux +hello.patch: unguarded + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.guards.qguard.out --- a/en/examples/results/mq.guards.qguard.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qguard.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ hg qguard goodbye.patch: unguarded + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.guards.qguard.pos.out --- a/en/examples/results/mq.guards.qguard.pos.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qguard.pos.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ hg qguard +foo $ hg qguard goodbye.patch: +foo + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.guards.qselect.cat.out --- a/en/examples/results/mq.guards.qselect.cat.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qselect.cat.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ cat .hg/patches/guards foo + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.guards.qselect.error.out --- a/en/examples/results/mq.guards.qselect.error.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qselect.error.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ hg qselect +foo abort: guard '+foo' starts with invalid character: '+' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.guards.qselect.foo.out --- a/en/examples/results/mq.guards.qselect.foo.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qselect.foo.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg qpop -a patch queue now empty $ hg qselect @@ -7,3 +8,4 @@ $ hg qselect foo + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.guards.qselect.foobar.out --- a/en/examples/results/mq.guards.qselect.foobar.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qselect.foobar.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,9 +1,11 @@ + $ hg qselect foo bar -number of unguarded, unapplied patches has changed from 0 to 2 +number of unguarded, unapplied patches has changed from 0 to 1 $ hg qpop -a -no patches applied +patch queue now empty $ hg qpush -a applying hello.patch applying goodbye.patch now at: goodbye.patch + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.guards.qselect.qpush.out --- a/en/examples/results/mq.guards.qselect.qpush.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qselect.qpush.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ hg qpush -a applying hello.patch applying goodbye.patch now at: goodbye.patch + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.guards.qselect.quux.out --- a/en/examples/results/mq.guards.qselect.quux.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.qselect.quux.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,7 +1,11 @@ + $ hg qselect quux -number of guarded, applied patches has changed from 0 to 2 +number of guarded, applied patches has changed from 0 to 1 $ hg qpop -a patch queue now empty $ hg qpush -a -patch series already fully applied +applying hello.patch +skipping goodbye.patch - guarded by ['+foo'] +now at: hello.patch + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.guards.series.out --- a/en/examples/results/mq.guards.series.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.guards.series.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ cat .hg/patches/series -hello.patch #-quux +hello.patch goodbye.patch #+foo + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.id.output.out --- a/en/examples/results/mq.id.output.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.id.output.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg qapplied first.patch second.patch @@ -31,3 +32,4 @@ @@ -0,0 +1,1 @@ +double u; + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.qinit-help.help.out --- a/en/examples/results/mq.qinit-help.help.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.qinit-help.help.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg help qinit hg qinit [-c] @@ -15,3 +16,4 @@ use "hg -v help qinit" to show global options + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.tarball.download.out --- a/en/examples/results/mq.tarball.download.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tarball.download.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ download netplug-1.2.5.tar.bz2 $ tar jxf netplug-1.2.5.tar.bz2 $ cd netplug-1.2.5 @@ -8,3 +9,4 @@ updating working directory 18 files updated, 0 files merged, 0 files removed, 0 files unresolved + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.tarball.newsource.out --- a/en/examples/results/mq.tarball.newsource.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tarball.newsource.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg qpop -a patch queue now empty $ cd .. @@ -12,3 +13,4 @@ $ cd netplug-1.2.8 $ hg commit --addremove --message netplug-1.2.8 + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.tarball.qinit.out --- a/en/examples/results/mq.tarball.qinit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tarball.qinit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd netplug $ hg qinit $ hg qnew -m 'fix build problem with gcc 4' build-fix.patch @@ -27,3 +28,4 @@ do_log(LOG_ERR, "Could not get socket details: %m"); + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.tarball.repush.out --- a/en/examples/results/mq.tarball.repush.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tarball.repush.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd ../netplug $ hg pull ../netplug-1.2.8 pulling from ../netplug-1.2.8 @@ -12,3 +13,4 @@ applying build-fix.patch now at: build-fix.patch + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.tools.lsdiff.out --- a/en/examples/results/mq.tools.lsdiff.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tools.lsdiff.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ lsdiff -nvv remove-redundant-null-checks.patch 22 File #1 a/drivers/char/agp/sgi-agp.c 24 Hunk #1 static int __devinit agp_sgi_init(void) @@ -20,3 +21,4 @@ 178 File #8 a/drivers/video/au1100fb.c 180 Hunk #1 void __exit au1100fb_cleanup(void) + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.tools.tools.out --- a/en/examples/results/mq.tools.tools.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tools.tools.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ diffstat -p1 remove-redundant-null-checks.patch drivers/char/agp/sgi-agp.c | 5 ++--- drivers/char/hvcs.c | 11 +++++------ @@ -22,3 +23,4 @@ module_init(au1100fb_init); + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.tutorial.add.out --- a/en/examples/results/mq.tutorial.add.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.add.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ echo 'file 3, line 1' >> file3 $ hg qnew add-file3.patch $ hg qnew -f add-file3.patch abort: patch "add-file3.patch" already exists + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.tutorial.qinit.out --- a/en/examples/results/mq.tutorial.qinit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qinit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg init mq-sandbox $ cd mq-sandbox $ echo 'line 1' > file1 @@ -6,3 +7,4 @@ $ hg commit -m'first change' $ hg qinit + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.tutorial.qnew.out --- a/en/examples/results/mq.tutorial.qnew.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qnew.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg tip changeset: tag: tip @@ -19,3 +20,4 @@ $ ls .hg/patches first.patch series status + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.tutorial.qnew2.out --- a/en/examples/results/mq.tutorial.qnew2.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qnew2.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,15 +1,16 @@ + $ hg qnew second.patch $ hg log --style=compact --limit=2 -2[qtip,second.patch,tip] 2009-03-10 04:38 +0000 bos +2[qtip,second.patch,tip] 2009-03-31 19:08 +0000 bos [mq]: second.patch -1[first.patch,qbase] 2009-03-10 04:38 +0000 bos +1[first.patch,qbase] 2009-03-31 19:08 +0000 bos [mq]: first.patch $ echo 'line 4' >> file1 $ hg qrefresh $ hg tip --style=compact --patch -2[qtip,second.patch,tip] 2009-03-10 04:38 +0000 bos +2[qtip,second.patch,tip] 2009-03-31 19:08 +0000 bos [mq]: second.patch diff -r -r file1 @@ -27,3 +28,4 @@ 1: line 3 2: line 4 + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.tutorial.qpop.out --- a/en/examples/results/mq.tutorial.qpop.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qpop.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg qapplied first.patch second.patch @@ -13,3 +14,4 @@ line 2 line 3 + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.tutorial.qpush-a.out --- a/en/examples/results/mq.tutorial.qpush-a.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qpush-a.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg qpush -a applying second.patch now at: second.patch @@ -7,3 +8,4 @@ line 3 line 4 + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.tutorial.qrefresh.out --- a/en/examples/results/mq.tutorial.qrefresh.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qrefresh.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ echo 'line 2' >> file1 $ hg diff diff -r file1 @@ -9,7 +10,7 @@ $ hg qrefresh $ hg diff $ hg tip --style=compact --patch -1[qtip,first.patch,tip,qbase] 2009-03-10 04:38 +0000 bos +1[qtip,first.patch,tip,qbase] 2009-03-31 19:08 +0000 bos [mq]: first.patch diff -r -r file1 @@ -20,3 +21,4 @@ +line 2 + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.tutorial.qrefresh2.out --- a/en/examples/results/mq.tutorial.qrefresh2.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qrefresh2.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,9 +1,10 @@ + $ echo 'line 3' >> file1 $ hg status M file1 $ hg qrefresh $ hg tip --style=compact --patch -1[qtip,first.patch,tip,qbase] 2009-03-10 04:38 +0000 bos +1[qtip,first.patch,tip,qbase] 2009-03-31 19:08 +0000 bos [mq]: first.patch diff -r -r file1 @@ -15,3 +16,4 @@ +line 3 + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/mq.tutorial.qseries.out --- a/en/examples/results/mq.tutorial.qseries.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/mq.tutorial.qseries.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg qseries first.patch second.patch @@ -5,3 +6,4 @@ first.patch second.patch + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/rename.divergent.clone.out --- a/en/examples/results/rename.divergent.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rename.divergent.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg clone orig anne updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -5,3 +6,4 @@ updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/rename.divergent.merge.out --- a/en/examples/results/rename.divergent.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rename.divergent.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + # See http://www.selenic.com/mercurial/bts/issue455 $ cd ../orig $ hg pull -u ../anne @@ -25,3 +26,4 @@ $ ls bar quux + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/rename.divergent.rename.anne.out --- a/en/examples/results/rename.divergent.rename.anne.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rename.divergent.rename.anne.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ cd anne $ hg mv foo bar $ hg ci -m 'Rename foo to bar' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/rename.divergent.rename.bob.out --- a/en/examples/results/rename.divergent.rename.bob.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rename.divergent.rename.bob.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ cd ../bob $ hg mv foo quux $ hg ci -m 'Rename foo to quux' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/rollback.add.out --- a/en/examples/results/rollback.add.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rollback.add.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ hg add b $ hg commit -m 'Add file b, this time for real' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/rollback.commit.out --- a/en/examples/results/rollback.commit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rollback.commit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ hg status M a $ echo b > b $ hg commit -m 'Add file b' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/rollback.rollback.out --- a/en/examples/results/rollback.rollback.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rollback.rollback.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg rollback rolling back last transaction $ hg tip @@ -11,3 +12,4 @@ M a ? b + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/rollback.status.out --- a/en/examples/results/rollback.status.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rollback.status.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg status ? b $ hg tip @@ -8,3 +9,4 @@ summary: Add file b + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/rollback.tip.out --- a/en/examples/results/rollback.tip.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rollback.tip.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,1 +1,3 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/rollback.twice.out --- a/en/examples/results/rollback.twice.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/rollback.twice.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ hg rollback rolling back last transaction $ hg rollback no rollback information available + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tag.init.out --- a/en/examples/results/tag.init.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.init.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ + $ hg init mytag $ cd mytag $ echo hello > myfile $ hg commit -A -m 'Initial commit' adding myfile + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tag.log.out --- a/en/examples/results/tag.log.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.log.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg log changeset: tag: tip @@ -12,3 +13,4 @@ summary: Initial commit + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tag.log.v1.0.out --- a/en/examples/results/tag.log.v1.0.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.log.v1.0.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ echo goodbye > myfile2 $ hg commit -A -m 'Second commit' adding myfile2 @@ -9,3 +10,4 @@ summary: Initial commit + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tag.remove.out --- a/en/examples/results/tag.remove.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.remove.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ hg tag --remove v1.0 $ hg tags tip + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tag.replace.out --- a/en/examples/results/tag.replace.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.replace.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg tag -r 1 v1.1 $ hg tags tip @@ -9,3 +10,4 @@ tip v1.1 + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tag.tag.out --- a/en/examples/results/tag.tag.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.tag.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,2 +1,4 @@ + $ hg tag v1.0 + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tag.tags.out --- a/en/examples/results/tag.tags.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.tags.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ hg tags tip v1.0 + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tag.tip.out --- a/en/examples/results/tag.tip.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tag.tip.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg tip changeset: tag: tip @@ -6,3 +7,4 @@ summary: Added tag v1.1 for changeset + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.simple.changelog.out --- a/en/examples/results/template.simple.changelog.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.changelog.out Tue Mar 31 12:19:01 2009 -0700 @@ -21,3 +21,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.simple.combine.out --- a/en/examples/results/template.simple.combine.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.combine.out Tue Mar 31 12:19:01 2009 -0700 @@ -5,3 +5,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.simple.compact.out --- a/en/examples/results/template.simple.compact.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.compact.out Tue Mar 31 12:19:01 2009 -0700 @@ -12,3 +12,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.simple.datekeyword.out --- a/en/examples/results/template.simple.datekeyword.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.datekeyword.out Tue Mar 31 12:19:01 2009 -0700 @@ -3,3 +3,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.simple.keywords.out --- a/en/examples/results/template.simple.keywords.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.keywords.out Tue Mar 31 12:19:01 2009 -0700 @@ -20,3 +20,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.simple.manyfilters.out --- a/en/examples/results/template.simple.manyfilters.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.manyfilters.out Tue Mar 31 12:19:01 2009 -0700 @@ -61,3 +61,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.simple.normal.out --- a/en/examples/results/template.simple.normal.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.normal.out Tue Mar 31 12:19:01 2009 -0700 @@ -6,3 +6,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.simple.rev.out --- a/en/examples/results/template.simple.rev.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.rev.out Tue Mar 31 12:19:01 2009 -0700 @@ -2,3 +2,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.simple.simplest.out --- a/en/examples/results/template.simple.simplest.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.simplest.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.simple.simplesub.out --- a/en/examples/results/template.simple.simplesub.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.simple.simplesub.out Tue Mar 31 12:19:01 2009 -0700 @@ -6,3 +6,5 @@ + + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.svnstyle.id.out --- a/en/examples/results/template.svnstyle.id.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.id.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,2 +1,4 @@ + $ hg log -r0 --template '{node}' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.svnstyle.result.out --- a/en/examples/results/template.svnstyle.result.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.result.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg log -r1 --style svn.style ------------------------------------------------------------------------ @@ -10,3 +11,4 @@ ------------------------------------------------------------------------ + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.svnstyle.short.out --- a/en/examples/results/template.svnstyle.short.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.short.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ svn log -r9653 ------------------------------------------------------------------------ r9653 | sean.hefty | 2006-09-27 14:39:55 -0700 (Wed, 27 Sep 2006) | 5 lines @@ -9,3 +10,4 @@ ------------------------------------------------------------------------ + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.svnstyle.simplest.out --- a/en/examples/results/template.svnstyle.simplest.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.simplest.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ cat svn.style changeset = "{node|short}\n" $ hg log -r1 --style svn.style + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.svnstyle.style.out --- a/en/examples/results/template.svnstyle.style.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.style.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ cat svn.style header = '------------------------------------------------------------------------\n\n' changeset = svn.template + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.svnstyle.syntax.error.out --- a/en/examples/results/template.svnstyle.syntax.error.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.syntax.error.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ hg log -r1 --style broken.style abort: broken.style:1: parse error + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.svnstyle.syntax.input.out --- a/en/examples/results/template.svnstyle.syntax.input.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.syntax.input.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ cat broken.style changeset = + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/template.svnstyle.template.out --- a/en/examples/results/template.svnstyle.template.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/template.svnstyle.template.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cat svn.template r{rev} | {author|user} | {date|isodate} ({date|rfc822date}) @@ -5,3 +6,4 @@ ------------------------------------------------------------------------ + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour-merge-conflict.commit.out --- a/en/examples/results/tour-merge-conflict.commit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour-merge-conflict.commit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cat > letter.txt <<EOF > Greetings! > I am Bryan O'Sullivan, no relation of the former @@ -15,3 +16,4 @@ summary: Send me your money + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour-merge-conflict.cousin.out --- a/en/examples/results/tour-merge-conflict.cousin.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour-merge-conflict.cousin.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd .. $ hg clone scam scam-cousin updating working directory @@ -10,3 +11,4 @@ > EOF $ hg commit -m '419 scam, with cousin' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour-merge-conflict.merge.out --- a/en/examples/results/tour-merge-conflict.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour-merge-conflict.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ export HGMERGE=merge $ echo 'XXX this is broken and must be fixed' XXX this is broken and must be fixed @@ -6,13 +7,14 @@ merge: warning: conflicts during merge merging letter.txt failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges +use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon $ cat letter.txt Greetings! -<<<<<<< /tmp/tour-merge-conflictBrdfE0/scam-merge/letter.txt +<<<<<<< /tmp/tour-merge-conflictP17yO-/scam-merge/letter.txt I am Shehu Musa Abacha, cousin to the former ======= I am Alhaji Abba Abacha, son of the former ->>>>>>> /tmp/letter.txt~other.1ctEYy +>>>>>>> /tmp/letter.txt~other.EVdwH3 Nigerian dictator Sani Abacha. + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour-merge-conflict.pull.out --- a/en/examples/results/tour-merge-conflict.pull.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour-merge-conflict.pull.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd .. $ hg clone scam-cousin scam-merge updating working directory @@ -13,3 +14,4 @@ not updating, since new heads added (run 'hg heads' to see heads, 'hg merge' to merge) + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour-merge-conflict.son.out --- a/en/examples/results/tour-merge-conflict.son.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour-merge-conflict.son.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd .. $ hg clone scam scam-son updating working directory @@ -10,3 +11,4 @@ > EOF $ hg commit -m '419 scam, with son' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour-merge-conflict.wife.out --- a/en/examples/results/tour-merge-conflict.wife.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour-merge-conflict.wife.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cat > letter.txt <<EOF > Greetings! > I am Mariam Abacha, the wife of former @@ -6,3 +7,4 @@ $ hg add letter.txt $ hg commit -m '419 scam, first draft' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.clone-pull.out --- a/en/examples/results/tour.clone-pull.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.clone-pull.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ cd .. $ hg clone hello hello-pull updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.clone-push.out --- a/en/examples/results/tour.clone-push.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.clone-push.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ cd .. $ hg clone hello hello-push updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.clone.out --- a/en/examples/results/tour.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg clone http://hg.serpentine.com/tutorial/hello destination directory: hello requesting all changes @@ -8,3 +9,4 @@ updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.commit.out --- a/en/examples/results/tour.commit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.commit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,2 +1,4 @@ + $ hg commit + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.diff.out --- a/en/examples/results/tour.diff.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.diff.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg diff diff -r hello.c @@ -10,3 +11,4 @@ return 0; } + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.help.out --- a/en/examples/results/tour.help.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.help.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg help init hg init [-e CMD] [--remotecmd CMD] [DEST] @@ -18,3 +19,4 @@ use "hg -v help init" to show global options + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.incoming.out --- a/en/examples/results/tour.incoming.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.incoming.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd hello-pull $ hg incoming ../my-hello comparing with ../my-hello @@ -9,3 +10,4 @@ summary: Added an extra line of output + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.log-r.out --- a/en/examples/results/tour.log-r.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.log-r.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg log -r 3 changeset: user: Bryan O'Sullivan <bos@serpentine.com> @@ -23,3 +24,4 @@ summary: Trim comments. + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.log-v.out --- a/en/examples/results/tour.log-v.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.log-v.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg log -v -r 3 changeset: user: Bryan O'Sullivan <bos@serpentine.com> @@ -8,3 +9,4 @@ + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.log-vp.out --- a/en/examples/results/tour.log-vp.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.log-vp.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg log -v -p -r 2 changeset: user: Bryan O'Sullivan <bos@serpentine.com> @@ -20,3 +21,4 @@ } + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.log.out --- a/en/examples/results/tour.log.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.log.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg log changeset: tag: tip @@ -26,3 +27,4 @@ summary: Create a standard "hello, world" program + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.log.range.out --- a/en/examples/results/tour.log.range.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.log.range.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg log -r 2:4 changeset: user: Bryan O'Sullivan <bos@serpentine.com> @@ -16,3 +17,4 @@ summary: Trim comments. + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.ls-a.out --- a/en/examples/results/tour.ls-a.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.ls-a.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,4 +1,6 @@ + $ cd hello $ ls -a . .. .hg Makefile hello.c + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.ls.out --- a/en/examples/results/tour.ls.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.ls.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ + $ ls -l $ ls hello Makefile hello.c + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.merge.cat.out --- a/en/examples/results/tour.merge.cat.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.cat.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cat hello.c /* * Placed in the public domain by Bryan O'Sullivan. This program is @@ -27,3 +28,4 @@ return 0; } + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.merge.clone.out --- a/en/examples/results/tour.merge.clone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.clone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd .. $ hg clone hello my-new-hello updating working directory @@ -6,3 +7,4 @@ $ sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c $ hg commit -m 'A new hello for a new day.' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.merge.commit.out --- a/en/examples/results/tour.merge.commit.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.commit.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,2 +1,4 @@ + $ hg commit -m 'Merged changes' + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.merge.heads.out --- a/en/examples/results/tour.merge.heads.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.heads.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg heads changeset: tag: tip @@ -12,3 +13,4 @@ summary: A new hello for a new day. + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.merge.merge.out --- a/en/examples/results/tour.merge.merge.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.merge.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ hg merge merging hello.c 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.merge.parents.out --- a/en/examples/results/tour.merge.parents.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.parents.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg parents changeset: user: Bryan O'Sullivan <bos@serpentine.com> @@ -27,3 +28,4 @@ return 0; } + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.merge.pull.out --- a/en/examples/results/tour.merge.pull.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.pull.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg pull ../my-hello pulling from ../my-hello searching for changes @@ -7,3 +8,4 @@ added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.merge.tip.out --- a/en/examples/results/tour.merge.tip.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.tip.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg tip changeset: tag: tip @@ -8,3 +9,4 @@ summary: Merged changes + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.merge.update.out --- a/en/examples/results/tour.merge.update.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.merge.update.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,5 @@ + $ hg update abort: crosses branches (use 'hg merge' or 'hg update -C') + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.older.out --- a/en/examples/results/tour.older.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.older.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg update 2 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg parents @@ -9,3 +10,4 @@ $ hg update 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.outgoing.net.out --- a/en/examples/results/tour.outgoing.net.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.outgoing.net.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg outgoing http://hg.serpentine.com/tutorial/hello comparing with http://hg.serpentine.com/tutorial/hello searching for changes @@ -8,3 +9,4 @@ summary: Added an extra line of output + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.outgoing.out --- a/en/examples/results/tour.outgoing.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.outgoing.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ cd my-hello $ hg outgoing ../hello-push comparing with ../hello-push @@ -9,3 +10,4 @@ summary: Added an extra line of output + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.parents.out --- a/en/examples/results/tour.parents.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.parents.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg parents changeset: tag: tip @@ -6,3 +7,4 @@ summary: Added an extra line of output + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.pull.out --- a/en/examples/results/tour.pull.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.pull.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg tip changeset: tag: tip @@ -21,3 +22,4 @@ summary: Added an extra line of output + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.push.net.out --- a/en/examples/results/tour.push.net.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.push.net.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ hg push http://hg.serpentine.com/tutorial/hello pushing to http://hg.serpentine.com/tutorial/hello searching for changes ssl required + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.push.nothing.out --- a/en/examples/results/tour.push.nothing.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.push.nothing.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ hg push ../hello-push pushing to ../hello-push searching for changes no changes found + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.push.out --- a/en/examples/results/tour.push.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.push.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg push ../hello-push pushing to ../hello-push searching for changes @@ -6,3 +7,4 @@ adding file changes added 1 changesets with 1 changes to 1 files + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.reclone.out --- a/en/examples/results/tour.reclone.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.reclone.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,6 +1,8 @@ + $ cd .. $ hg clone hello my-hello updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd my-hello + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.sed.out --- a/en/examples/results/tour.sed.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.sed.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,2 +1,4 @@ + $ sed -i '/printf/a\\tprintf("hello again!\\n");' hello.c + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.status.out --- a/en/examples/results/tour.status.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.status.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,5 +1,7 @@ + $ ls Makefile hello.c $ hg status M hello.c + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.tip.out --- a/en/examples/results/tour.tip.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.tip.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ hg tip -vp changeset: tag: tip @@ -20,3 +21,4 @@ } + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.update.out --- a/en/examples/results/tour.update.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.update.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ + $ grep printf hello.c printf("hello, world!\"); $ hg update tip @@ -6,3 +7,4 @@ printf("hello, world!\"); printf("hello again!\n"); + diff -r c82ff69f0935 -r 4432ad34b8e5 en/examples/results/tour.version.out --- a/en/examples/results/tour.version.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour.version.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,7 +1,9 @@ + $ hg version -Mercurial Distributed SCM (version ) +Mercurial Distributed SCM (version unknown) -Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others +Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +