Mercurial > hgbook
changeset 144:006bbad1f190
Add expected output files.
This makes it possible to spot changes in Mercurial's output and
behaviour over time.
line wrap: on
line diff
--- a/.hgignore Tue Mar 06 21:43:30 2007 -0800 +++ b/.hgignore Tue Mar 06 21:44:56 2007 -0800 @@ -19,7 +19,7 @@ *.lg *.lo[fgt] *.orig -*.out +*/pdf/*.out *.pdf *.png *.ps
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/backout.init.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,7 @@ +$ \textbf{hg init myrepo} +$ \textbf{cd myrepo} +$ \textbf{echo first change >> myfile} +$ \textbf{hg add myfile} +$ \textbf{hg commit -m 'first change'} +$ \textbf{echo second change >> myfile} +$ \textbf{hg commit -m 'second change'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/backout.manual.backout.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,7 @@ +$ \textbf{echo third change >> myfile} +$ \textbf{hg commit -m 'third change'} +$ \textbf{hg backout -m 'back out second change' 1} +reverting myfile +changeset backs out changeset +the backout changeset is a new head - do not forget to merge +(use "backout --merge" if you want to auto-merge)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/backout.manual.cat.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{cat myfile} +first change
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/backout.manual.clone.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,9 @@ +$ \textbf{cd ..} +$ \textbf{hg clone -r1 myrepo newrepo} +requesting all changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +$ \textbf{cd newrepo}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/backout.manual.heads.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,13 @@ +$ \textbf{hg heads} +changeset: +tag: tip +parent: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: back out second change + +changeset: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: third change +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/backout.manual.log.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,13 @@ +$ \textbf{hg log --style compact} +3[tip]:1 + back out second change + +2 + third change + +1 + second change + +0 + first change +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/backout.manual.merge.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,7 @@ +$ \textbf{hg merge} +merging myfile +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +$ \textbf{hg commit -m 'merged backout with previous tip'} +$ \textbf{cat myfile} +third change
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/backout.manual.parents.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,8 @@ +$ \textbf{hg parents} +changeset: +tag: tip +parent: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: back out second change +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/backout.non-tip.backout.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,9 @@ +$ \textbf{echo third change >> myfile} +$ \textbf{hg commit -m 'third change'} +$ \textbf{hg backout --merge -m 'back out second change' 1} +reverting myfile +changeset backs out changeset +merging with changeset +merging myfile +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/backout.non-tip.cat.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{cat myfile} +third change
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/backout.non-tip.clone.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,9 @@ +$ \textbf{cd ..} +$ \textbf{hg clone -r1 myrepo non-tip-repo} +requesting all changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +$ \textbf{cd non-tip-repo}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/backout.simple.log.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,10 @@ +$ \textbf{hg log --style compact} +2[tip] + back out second change + +1 + second change + +0 + first change +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/backout.simple.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,5 @@ +$ \textbf{hg backout -m 'back out second change' tip} +reverting myfile +changeset backs out changeset +$ \textbf{cat myfile} +first change
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/bisect.commits.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,10 @@ +$ \textbf{buggy_change=37} +$ \textbf{for (( i = 0; i < 50; i++ )); do} +> \textbf{ if [[ $i = $buggy_change ]]; then} +> \textbf{ echo 'i have a gub' > myfile$i} +> \textbf{ hg commit -q -A -m 'buggy changeset'} +> \textbf{ else} +> \textbf{ echo 'nothing to see here, move along' > myfile$i} +> \textbf{ hg commit -q -A -m 'normal changeset'} +> \textbf{ fi} +> \textbf{done}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/bisect.help.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ + \textbf{hg help bisect} + \textbf{hg bisect help}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/bisect.init.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{hg init mybug} +$ \textbf{cd mybug}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/bisect.search.bad-init.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,1 @@ + \textbf{hg bisect bad}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/bisect.search.good-init.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,1 @@ + \textbf{hg bisect good 10}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/bisect.search.init.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,1 @@ + \textbf{hg bisect init}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/bisect.search.mytest.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,10 @@ + \textbf{mytest() \{} + \textbf{ if grep -q 'i have a gub' *} + \textbf{ then} + \textbf{ result=bad} + \textbf{ else} + \textbf{ result=good} + \textbf{ fi} + \textbf{ echo this revision is $result} + \textbf{ hg bisect $result} + \textbf{\}}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/bisect.search.reset.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,1 @@ + \textbf{hg bisect reset}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/bisect.search.rest.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ + \textbf{mytest} + \textbf{mytest} + \textbf{mytest}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/bisect.search.step1.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,8 @@ + \textbf{if grep -q 'i have a gub' *} + \textbf{then} + \textbf{ result=bad} + \textbf{else} + \textbf{ result=good} + \textbf{fi} + \textbf{echo this revision is $result} + \textbf{hg bisect $result}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/bisect.search.step2.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,1 @@ + \textbf{mytest}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/cmdref.diff-p.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,22 @@ +$ \textbf{echo '[diff]' >> $HGRC} +$ \textbf{echo 'showfunc = False' >> $HGRC} +$ \textbf{hg diff} +diff -r myfile.c + + +@@ -1,4 +1,4 @@ + int myfunc() + \{ +- return 1; ++ return 10; + \} +$ \textbf{hg diff -p} +diff -r myfile.c + + +@@ -1,4 +1,4 @@ int myfunc() + int myfunc() + \{ +- return 1; ++ return 10; + \}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.copy.after.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{cp a z} +$ \textbf{hg copy --after a z}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.copy.cat.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,5 @@ +$ \textbf{cat file} +line +new contents +$ \textbf{cat ../my-copy/new-file} +line
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.copy.clone.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{cd ..} +$ \textbf{hg clone my-copy your-copy} +1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.copy.copy.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{cd my-copy} +$ \textbf{hg copy file new-file}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.copy.dir-dest.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ +$ \textbf{mkdir d} +$ \textbf{hg copy a b d} +$ \textbf{ls d} +a b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.copy.dir-src-dest.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{hg copy c d} +copying c/a/c to d/c/a/c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.copy.dir-src.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{hg copy c e} +copying c/a/c to e/a/c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.copy.init.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,5 @@ +$ \textbf{hg init my-copy} +$ \textbf{cd my-copy} +$ \textbf{echo line > file} +$ \textbf{hg add file} +$ \textbf{hg commit -m 'Added a file'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.copy.merge.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,15 @@ +$ \textbf{hg pull ../my-copy} +pulling from ../my-copy +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +(run 'hg heads' to see heads, 'hg merge' to merge) +$ \textbf{hg merge} +merging file and new-file +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +$ \textbf{cat new-file} +line +new contents
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.copy.other.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{cd ../your-copy} +$ \textbf{echo 'new contents' >> file} +$ \textbf{hg commit -m 'Changed file'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.copy.simple.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{hg copy a c} +c/a: not overwriting - file exists
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.copy.status-copy.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ +$ \textbf{hg status -C} +A new-file + file +$ \textbf{hg commit -m 'Copied file'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.copy.status.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{hg status} +A new-file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.files.add-dir.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,10 @@ +$ \textbf{mkdir b} +$ \textbf{echo b > b/b} +$ \textbf{echo c > b/c} +$ \textbf{mkdir b/d} +$ \textbf{echo d > b/d/d} +$ \textbf{hg add b} +adding b/b +adding b/c +adding b/d/d +$ \textbf{hg commit -m 'Added all files in subdirectory'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.files.add.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,10 @@ +$ \textbf{hg init add-example} +$ \textbf{cd add-example} +$ \textbf{echo a > a} +$ \textbf{hg status} +? a +$ \textbf{hg add a} +$ \textbf{hg status} +A a +$ \textbf{hg commit -m 'Added one file'} +$ \textbf{hg status}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.files.addremove.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,7 @@ +$ \textbf{hg init addremove-example} +$ \textbf{cd addremove-example} +$ \textbf{echo a > a} +$ \textbf{echo b > b} +$ \textbf{hg addremove} +adding a +adding b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.files.commit-addremove.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{echo c > c} +$ \textbf{hg commit -A -m 'Commit with addremove'} +adding c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.files.hidden.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,13 @@ +$ \textbf{hg init hidden-example} +$ \textbf{cd hidden-example} +$ \textbf{mkdir empty} +$ \textbf{touch empty/.hidden} +$ \textbf{hg add empty/.hidden} +$ \textbf{hg commit -m 'Manage an empty-looking directory'} +$ \textbf{ls empty} +$ \textbf{cd ..} +$ \textbf{hg clone hidden-example tmp} +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +$ \textbf{ls tmp} +empty +$ \textbf{ls tmp/empty}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.files.missing.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,8 @@ +$ \textbf{hg init missing-example} +$ \textbf{cd missing-example} +$ \textbf{echo a > a} +$ \textbf{hg add a} +$ \textbf{hg commit -m'File about to be missing'} +$ \textbf{rm a} +$ \textbf{hg status} +! a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.files.recover-missing.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ +$ \textbf{hg revert a} +$ \textbf{cat a} +a +$ \textbf{hg status}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.files.remove-after.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{hg remove --after a} +$ \textbf{hg status} +R a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.files.remove.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,13 @@ +$ \textbf{hg init remove-example} +$ \textbf{cd remove-example} +$ \textbf{echo a > a} +$ \textbf{mkdir b} +$ \textbf{echo b > b/b} +$ \textbf{hg add a b} +adding b/b +$ \textbf{hg commit -m 'Small example for file removal'} +$ \textbf{hg remove a} +$ \textbf{hg status} +R a +$ \textbf{hg remove b} +removing b/b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.rename.rename.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,1 @@ +$ \textbf{hg rename a b}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.rename.status-copy.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ +$ \textbf{hg status -C} +A b + a +R a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.rename.status.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{hg status} +A b +R a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.revert.add.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,7 @@ +$ \textbf{echo oops > oops} +$ \textbf{hg add oops} +$ \textbf{hg status oops} +A oops +$ \textbf{hg revert oops} +$ \textbf{hg status} +? oops
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.revert.copy.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ +$ \textbf{hg copy file new-file} +$ \textbf{hg revert new-file} +$ \textbf{hg status} +? new-file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.revert.missing.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,6 @@ +$ \textbf{rm file} +$ \textbf{hg status} +! file +$ \textbf{hg revert file} +$ \textbf{ls file} +file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.revert.modify.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,10 @@ +$ \textbf{cat file} +original content +$ \textbf{echo unwanted change >> file} +$ \textbf{hg diff file} +diff -r file + + +@@ -1,1 +1,2 @@ original content + original content ++unwanted change
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.revert.remove.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,7 @@ +$ \textbf{hg remove file} +$ \textbf{hg status} +R file +$ \textbf{hg revert file} +$ \textbf{hg status} +$ \textbf{ls file} +file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.revert.rename-orig.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{hg revert file} +$ \textbf{hg status} +? new-file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.revert.rename.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,5 @@ +$ \textbf{hg rename file new-file} +$ \textbf{hg revert new-file} +$ \textbf{hg status} +R file +? new-file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.revert.status.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,5 @@ +$ \textbf{hg status} +? file.orig +$ \textbf{cat file.orig} +original content +unwanted change
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/daily.revert.unmodify.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,5 @@ +$ \textbf{hg status} +M file +$ \textbf{hg revert file} +$ \textbf{cat file} +original content
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/filenames.dirs.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,5 @@ +$ \textbf{hg status src} +? src/main.py +? src/watcher/_watcher.c +? src/watcher/watcher.py +? src/xyzzy.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/filenames.files.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,1 @@ +$ \textbf{hg add COPYING README examples/simple.py}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/filenames.filter.exclude.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{hg status -X '**.py' src} +? src/watcher/_watcher.c +? src/xyzzy.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/filenames.filter.include.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{hg status -I '*.in'} +? MANIFEST.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/filenames.glob.group.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{hg status 'glob:*.\{in,py\}'} +? MANIFEST.in +? setup.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/filenames.glob.question.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{hg status 'glob:**.?'} +? src/watcher/_watcher.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/filenames.glob.range.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{hg status 'glob:**[nr-t]'} +? MANIFEST.in +? src/xyzzy.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/filenames.glob.star-starstar.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,8 @@ +$ \textbf{hg status 'glob:*.py'} +? setup.py +$ \textbf{hg status 'glob:**.py'} +A examples/simple.py +A src/main.py +? examples/performant.py +? setup.py +? src/watcher/watcher.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/filenames.glob.star.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{hg add 'glob:*.py'} +adding main.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/filenames.glob.starstar.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,7 @@ +$ \textbf{cd ..} +$ \textbf{hg status 'glob:**.py'} +A examples/simple.py +A src/main.py +? examples/performant.py +? setup.py +? src/watcher/watcher.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/filenames.wdir-relname.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,22 @@ +$ \textbf{hg status} +A COPYING +A README +A examples/simple.py +? MANIFEST.in +? examples/performant.py +? setup.py +? src/main.py +? src/watcher/_watcher.c +? src/watcher/watcher.py +? src/xyzzy.txt +$ \textbf{hg status `hg root`} +A ../COPYING +A ../README +A ../examples/simple.py +? ../MANIFEST.in +? ../examples/performant.py +? ../setup.py +? main.py +? watcher/_watcher.c +? watcher/watcher.py +? xyzzy.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/filenames.wdir-subdir.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,14 @@ +$ \textbf{cd src} +$ \textbf{hg add -n} +adding ../MANIFEST.in +adding ../examples/performant.py +adding ../setup.py +adding main.py +adding watcher/_watcher.c +adding watcher/watcher.py +adding xyzzy.txt +$ \textbf{hg add -n .} +adding main.py +adding watcher/_watcher.c +adding watcher/watcher.py +adding xyzzy.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/hook.msglen.run.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,10 @@ +$ \textbf{cat .hg/hgrc} +[hooks] +pretxncommit.msglen = test `hg tip --template \{desc\} | wc -c` -ge 10 +$ \textbf{echo a > a} +$ \textbf{hg add a} +$ \textbf{hg commit -A -m 'too short'} +abort: pretxncommit.msglen hook exited with status 1 +transaction abort! +rollback completed +$ \textbf{hg commit -A -m 'long enough'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/hook.simple.ext.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,5 @@ +$ \textbf{echo 'commit.when = echo -n "date of commit: "; date' >> .hg/hgrc} +$ \textbf{echo a >> a} +$ \textbf{hg commit -m 'i have two hooks'} +committed +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/hook.simple.init.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,11 @@ +$ \textbf{hg init hook-test} +$ \textbf{cd hook-test} +$ \textbf{echo '[hooks]' >> .hg/hgrc} +$ \textbf{echo 'commit = echo committed $HG_NODE' >> .hg/hgrc} +$ \textbf{cat .hg/hgrc} +[hooks] +commit = echo committed $HG_NODE +$ \textbf{echo a > a} +$ \textbf{hg add a} +$ \textbf{hg commit -m 'testing commit hook'} +committed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/hook.simple.pretxncommit.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,13 @@ +$ \textbf{cat check_bug_id} +#!/bin/sh +# check that a commit comment mentions a numeric bug id +hg log -r $1 --template \{desc\} | grep -q "\textbackslash{}<bug *[0-9]" +$ \textbf{echo 'pretxncommit.bug_id_required = ./check_bug_id $HG_NODE' >> .hg/hgrc} +$ \textbf{echo a >> a} +$ \textbf{hg commit -m 'i am not mentioning a bug id'} +abort: pretxncommit.bug_id_required hook exited with status 1 +transaction abort! +rollback completed +$ \textbf{hg commit -m 'i refer you to bug 666'} +committed +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/hook.ws.better.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,106 @@ +$ \textbf{cat .hg/hgrc} +[hooks] +pretxncommit.whitespace = check_whitespace.py +$ \textbf{echo 'a ' >> a} +$ \textbf{hg commit -A -m 'add new line with trailing whitespace'} +adding check_whitespace.py +a, line 2: trailing whitespace added +check_whitespace.py, line 1: trailing whitespace added +check_whitespace.py, line 2: trailing whitespace added +check_whitespace.py, line 3: trailing whitespace added +check_whitespace.py, line 4: trailing whitespace added +check_whitespace.py, line 5: trailing whitespace added +check_whitespace.py, line 6: trailing whitespace added +check_whitespace.py, line 7: trailing whitespace added +check_whitespace.py, line 8: trailing whitespace added +check_whitespace.py, line 9: trailing whitespace added +check_whitespace.py, line 10: trailing whitespace added +check_whitespace.py, line 11: trailing whitespace added +check_whitespace.py, line 12: trailing whitespace added +check_whitespace.py, line 13: trailing whitespace added +check_whitespace.py, line 14: trailing whitespace added +check_whitespace.py, line 15: trailing whitespace added +check_whitespace.py, line 16: trailing whitespace added +check_whitespace.py, line 17: trailing whitespace added +check_whitespace.py, line 18: trailing whitespace added +check_whitespace.py, line 19: trailing whitespace added +check_whitespace.py, line 20: trailing whitespace added +check_whitespace.py, line 21: trailing whitespace added +check_whitespace.py, line 22: trailing whitespace added +check_whitespace.py, line 23: trailing whitespace added +check_whitespace.py, line 24: trailing whitespace added +check_whitespace.py, line 25: trailing whitespace added +check_whitespace.py, line 26: trailing whitespace added +check_whitespace.py, line 27: trailing whitespace added +check_whitespace.py, line 28: trailing whitespace added +check_whitespace.py, line 29: trailing whitespace added +check_whitespace.py, line 30: trailing whitespace added +check_whitespace.py, line 31: trailing whitespace added +check_whitespace.py, line 32: trailing whitespace added +check_whitespace.py, line 33: trailing whitespace added +check_whitespace.py, line 34: trailing whitespace added +check_whitespace.py, line 35: trailing whitespace added +check_whitespace.py, line 36: trailing whitespace added +check_whitespace.py, line 37: trailing whitespace added +check_whitespace.py, line 38: trailing whitespace added +check_whitespace.py, line 39: trailing whitespace added +check_whitespace.py, line 40: trailing whitespace added +check_whitespace.py, line 41: trailing whitespace added +check_whitespace.py, line 42: trailing whitespace added +check_whitespace.py, line 43: trailing whitespace added +check_whitespace.py, line 44: trailing whitespace added +commit message saved to .hg/commit.save +abort: pretxncommit.whitespace hook exited with status 1 +transaction abort! +rollback completed +$ \textbf{perl -pi -e 's,\textbackslash{}s+$,,' a} +$ \textbf{hg commit -A -m 'trimmed trailing whitespace'} +a, line 1: trailing whitespace added +check_whitespace.py, line 1: trailing whitespace added +check_whitespace.py, line 2: trailing whitespace added +check_whitespace.py, line 3: trailing whitespace added +check_whitespace.py, line 4: trailing whitespace added +check_whitespace.py, line 5: trailing whitespace added +check_whitespace.py, line 6: trailing whitespace added +check_whitespace.py, line 7: trailing whitespace added +check_whitespace.py, line 8: trailing whitespace added +check_whitespace.py, line 9: trailing whitespace added +check_whitespace.py, line 10: trailing whitespace added +check_whitespace.py, line 11: trailing whitespace added +check_whitespace.py, line 12: trailing whitespace added +check_whitespace.py, line 13: trailing whitespace added +check_whitespace.py, line 14: trailing whitespace added +check_whitespace.py, line 15: trailing whitespace added +check_whitespace.py, line 16: trailing whitespace added +check_whitespace.py, line 17: trailing whitespace added +check_whitespace.py, line 18: trailing whitespace added +check_whitespace.py, line 19: trailing whitespace added +check_whitespace.py, line 20: trailing whitespace added +check_whitespace.py, line 21: trailing whitespace added +check_whitespace.py, line 22: trailing whitespace added +check_whitespace.py, line 23: trailing whitespace added +check_whitespace.py, line 24: trailing whitespace added +check_whitespace.py, line 25: trailing whitespace added +check_whitespace.py, line 26: trailing whitespace added +check_whitespace.py, line 27: trailing whitespace added +check_whitespace.py, line 28: trailing whitespace added +check_whitespace.py, line 29: trailing whitespace added +check_whitespace.py, line 30: trailing whitespace added +check_whitespace.py, line 31: trailing whitespace added +check_whitespace.py, line 32: trailing whitespace added +check_whitespace.py, line 33: trailing whitespace added +check_whitespace.py, line 34: trailing whitespace added +check_whitespace.py, line 35: trailing whitespace added +check_whitespace.py, line 36: trailing whitespace added +check_whitespace.py, line 37: trailing whitespace added +check_whitespace.py, line 38: trailing whitespace added +check_whitespace.py, line 39: trailing whitespace added +check_whitespace.py, line 40: trailing whitespace added +check_whitespace.py, line 41: trailing whitespace added +check_whitespace.py, line 42: trailing whitespace added +check_whitespace.py, line 43: trailing whitespace added +check_whitespace.py, line 44: trailing whitespace added +commit message saved to .hg/commit.save +abort: pretxncommit.whitespace hook exited with status 1 +transaction abort! +rollback completed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/hook.ws.simple.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,11 @@ +$ \textbf{cat .hg/hgrc} +[hooks] +pretxncommit.whitespace = hg export tip | (! grep -qP '^\textbackslash{}+.*[ \textbackslash{}t]$') +$ \textbf{echo 'a ' > a} +$ \textbf{hg commit -A -m 'test with trailing whitespace'} +adding a +abort: pretxncommit.whitespace hook exited with status 1 +transaction abort! +rollback completed +$ \textbf{echo 'a' > a} +$ \textbf{hg commit -A -m 'drop trailing whitespace and try again'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.dodiff.diff.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,13 @@ +$ \textbf{echo 'this is my first line' > oldfile} +$ \textbf{echo 'my first line is here' > newfile} +$ \textbf{diff -u oldfile newfile > tiny.patch} +$ \textbf{cat tiny.patch} + + +@@ -1 +1 @@ +-this is my first line ++my first line is here +$ \textbf{patch < tiny.patch} +patching file oldfile +$ \textbf{cat newfile} +my first line is here
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.guards.init.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,9 @@ +$ \textbf{hg qinit} +$ \textbf{hg qnew hello.patch} +$ \textbf{echo hello > hello} +$ \textbf{hg add hello} +$ \textbf{hg qrefresh} +$ \textbf{hg qnew goodbye.patch} +$ \textbf{echo goodbye > goodbye} +$ \textbf{hg add goodbye} +$ \textbf{hg qrefresh}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.guards.qguard.neg.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{hg qguard hello.patch -quux} +$ \textbf{hg qguard hello.patch} +hello.patch: -quux
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.guards.qguard.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{hg qguard} +goodbye.patch: unguarded
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.guards.qguard.pos.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{hg qguard +foo} +$ \textbf{hg qguard} +goodbye.patch: +foo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.guards.qselect.cat.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{cat .hg/patches/guards} +foo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.guards.qselect.error.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{hg qselect +foo} +abort: guard '+foo' starts with invalid character: '+'
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.guards.qselect.foo.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,8 @@ +$ \textbf{hg qpop -a} +Patch queue now empty +$ \textbf{hg qselect} +no active guards +$ \textbf{hg qselect foo} +number of unguarded, unapplied patches has changed from 1 to 2 +$ \textbf{hg qselect} +foo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.guards.qselect.foobar.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,8 @@ +$ \textbf{hg qselect foo bar} +number of unguarded, unapplied patches has changed from 0 to 2 +$ \textbf{hg qpop -a} +no patches applied +$ \textbf{hg qpush -a} +applying hello.patch +applying goodbye.patch +Now at: goodbye.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.guards.qselect.qpush.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ +$ \textbf{hg qpush -a} +applying hello.patch +applying goodbye.patch +Now at: goodbye.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.guards.qselect.quux.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,6 @@ +$ \textbf{hg qselect quux} +number of guarded, applied patches has changed from 0 to 2 +$ \textbf{hg qpop -a} +Patch queue now empty +$ \textbf{hg qpush -a} +patch series already fully applied
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.guards.series.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{cat .hg/patches/series} +hello.patch #-quux +goodbye.patch #+foo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.id.out.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,32 @@ +$ \textbf{hg qapplied} +first.patch +second.patch +$ \textbf{hg log -r qbase:qtip} +changeset: +tag: first.patch +tag: qbase +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: patch queue: first.patch + +changeset: +tag: second.patch +tag: qtip +tag: tip +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: patch queue: second.patch + +$ \textbf{hg export second.patch} +# HG changeset patch +# User Bryan O'Sullivan <bos@serpentine.com> + +# Node ID +# Parent +patch queue: second.patch + +diff -r -r other.c + + +@@ -0,0 +1,1 @@ ++double u;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.qinit-help.help.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,13 @@ +$ \textbf{hg help qinit} +hg qinit [-c] + +init a new queue repository + + The queue repository is unversioned by default. If -c is + specified, qinit will create a separate nested repository + for patches. Use qcommit to commit changes to this queue + repository. + +options: + + -c --create-repo create queue repository
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.tarball.download.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,8 @@ +$ \textbf{download netplug-1.2.5.tar.bz2} +$ \textbf{tar jxf netplug-1.2.5.tar.bz2} +$ \textbf{cd netplug-1.2.5} +$ \textbf{hg init} +$ \textbf{hg commit -q --addremove --message netplug-1.2.5} +$ \textbf{cd ..} +$ \textbf{hg clone netplug-1.2.5 netplug} +18 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.tarball.newsource.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,12 @@ +$ \textbf{hg qpop -a} +Patch queue now empty +$ \textbf{cd ..} +$ \textbf{download netplug-1.2.8.tar.bz2} +$ \textbf{hg clone netplug-1.2.5 netplug-1.2.8} +18 files updated, 0 files merged, 0 files removed, 0 files unresolved +$ \textbf{cd netplug-1.2.8} +$ \textbf{hg locate -0 | xargs -0 rm} +$ \textbf{cd ..} +$ \textbf{tar jxf netplug-1.2.8.tar.bz2} +$ \textbf{cd netplug-1.2.8} +$ \textbf{hg commit --addremove --message netplug-1.2.8}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.tarball.qinit.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,28 @@ +$ \textbf{cd netplug} +$ \textbf{hg qinit} +$ \textbf{hg qnew -m 'fix build problem with gcc 4' build-fix.patch} +$ \textbf{perl -pi -e 's/int addr_len/socklen_t addr_len/' netlink.c} +$ \textbf{hg qrefresh} +$ \textbf{hg tip -p} +changeset: +tag: qtip +tag: build-fix.patch +tag: tip +tag: qbase +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: fix build problem with gcc 4 + +diff -r -r netlink.c + + +@@ -275,7 +275,7 @@ netlink_open(void) + exit(1); + \} + +- int addr_len = sizeof(addr); ++ socklen_t addr_len = sizeof(addr); + + if (getsockname(fd, (struct sockaddr *) &addr, &addr_len) == -1) \{ + do_log(LOG_ERR, "Could not get socket details: %m"); +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.tarball.repush.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,12 @@ +$ \textbf{cd ../netplug} +$ \textbf{hg pull ../netplug-1.2.8} +pulling from ../netplug-1.2.8 +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 12 changes to 12 files +(run 'hg update' to get a working copy) +$ \textbf{hg qpush -a} +applying build-fix.patch +Now at: build-fix.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.tools.lsdiff.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,21 @@ +$ \textbf{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) +37 File #2 a/drivers/char/hvcs.c + 39 Hunk #1 static struct tty_operations hvcs_ops = + 53 Hunk #2 static int hvcs_alloc_index_list(int n) +69 File #3 a/drivers/message/fusion/mptfc.c + 71 Hunk #1 mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, in +85 File #4 a/drivers/message/fusion/mptsas.c + 87 Hunk #1 mptsas_probe_hba_phys(MPT_ADAPTER *ioc) +98 File #5 a/drivers/net/fs_enet/fs_enet-mii.c + 100 Hunk #1 static struct fs_enet_mii_bus *create_bu +111 File #6 a/drivers/net/wireless/ipw2200.c + 113 Hunk #1 static struct ipw_fw_error *ipw_alloc_er + 126 Hunk #2 static ssize_t clear_error(struct device + 140 Hunk #3 static void ipw_irq_tasklet(struct ipw_p + 150 Hunk #4 static void ipw_pci_remove(struct pci_de +164 File #7 a/drivers/scsi/libata-scsi.c + 166 Hunk #1 int ata_cmd_ioctl(struct scsi_device *sc +178 File #8 a/drivers/video/au1100fb.c + 180 Hunk #1 void __exit au1100fb_cleanup(void)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.tools.tools.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,23 @@ +$ \textbf{diffstat -p1 remove-redundant-null-checks.patch} + drivers/char/agp/sgi-agp.c | 5 ++--- + drivers/char/hvcs.c | 11 +++++------ + drivers/message/fusion/mptfc.c | 6 ++---- + drivers/message/fusion/mptsas.c | 3 +-- + drivers/net/fs_enet/fs_enet-mii.c | 3 +-- + drivers/net/wireless/ipw2200.c | 22 ++++++---------------- + drivers/scsi/libata-scsi.c | 4 +--- + drivers/video/au1100fb.c | 3 +-- + 8 files changed, 19 insertions(+), 38 deletions(-) +$ \textbf{filterdiff -i '*/video/*' remove-redundant-null-checks.patch} + + +@@ -743,8 +743,7 @@ void __exit au1100fb_cleanup(void) + \{ + driver_unregister(&au1100fb_driver); + +- if (drv_info.opt_mode) +- kfree(drv_info.opt_mode); ++ kfree(drv_info.opt_mode); + \} + + module_init(au1100fb_init);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.tutorial.add.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ +$ \textbf{echo 'file 3, line 1' >> file3} +$ \textbf{hg qnew add-file3.patch} +$ \textbf{hg qnew -f add-file3.patch} +abort: patch "add-file3.patch" already exists
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.tutorial.qinit.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,7 @@ +$ \textbf{hg init mq-sandbox} +$ \textbf{cd mq-sandbox} +$ \textbf{echo 'line 1' > file1} +$ \textbf{echo 'another line 1' > file2} +$ \textbf{hg add file1 file2} +$ \textbf{hg commit -m'first change'} +$ \textbf{hg qinit}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.tutorial.qnew.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,20 @@ +$ \textbf{hg tip} +changeset: +tag: tip +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: first change + +$ \textbf{hg qnew first.patch} +$ \textbf{hg tip} +changeset: +tag: qtip +tag: first.patch +tag: tip +tag: qbase +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: New patch: first.patch + +$ \textbf{ls .hg/patches} +first.patch series status
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.tutorial.qnew2.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,28 @@ +$ \textbf{hg qnew second.patch} +$ \textbf{hg log --style=compact --limit=2} +2[second.patch,qtip,tip] + New patch: second.patch + +1[first.patch,qbase] + patch queue: first.patch + +$ \textbf{echo 'line 4' >> file1} +$ \textbf{hg qrefresh} +$ \textbf{hg tip --style=compact --patch} +2[second.patch,qtip,tip] + patch queue: second.patch + +diff -r -r file1 + + +@@ -1,3 +1,4 @@ line 1 + line 1 + line 2 + line 3 ++line 4 + +$ \textbf{hg annotate file1} +0: line 1 +1: line 2 +1: line 3 +2: line 4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.tutorial.qpop.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,14 @@ +$ \textbf{hg qapplied} +first.patch +second.patch +$ \textbf{hg qpop} +Now at: first.patch +$ \textbf{hg qseries} +first.patch +second.patch +$ \textbf{hg qapplied} +first.patch +$ \textbf{cat file1} +line 1 +line 2 +line 3
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.tutorial.qpush-a.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,8 @@ +$ \textbf{hg qpush -a} +applying second.patch +Now at: second.patch +$ \textbf{cat file1} +line 1 +line 2 +line 3 +line 4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.tutorial.qrefresh.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,21 @@ +$ \textbf{echo 'line 2' >> file1} +$ \textbf{hg diff} +diff -r file1 + + +@@ -1,1 +1,2 @@ line 1 + line 1 ++line 2 +$ \textbf{hg qrefresh} +$ \textbf{hg diff} +$ \textbf{hg tip --style=compact --patch} +1[qtip,first.patch,tip,qbase] + patch queue: first.patch + +diff -r -r file1 + + +@@ -1,1 +1,2 @@ line 1 + line 1 ++line 2 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.tutorial.qrefresh2.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,16 @@ +$ \textbf{echo 'line 3' >> file1} +$ \textbf{hg status} +M file1 +$ \textbf{hg qrefresh} +$ \textbf{hg tip --style=compact --patch} +1[qtip,first.patch,tip,qbase] + patch queue: first.patch + +diff -r -r file1 + + +@@ -1,1 +1,3 @@ line 1 + line 1 ++line 2 ++line 3 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.tutorial.qseries.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,6 @@ +$ \textbf{hg qseries} +first.patch +second.patch +$ \textbf{hg qapplied} +first.patch +second.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/rollback.add.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{hg add b} +$ \textbf{hg commit -m 'Add file b, this time for real'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/rollback.commit.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ +$ \textbf{hg status} +M a +$ \textbf{echo b > b} +$ \textbf{hg commit -m 'Add file b'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/rollback.rollback.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,12 @@ +$ \textbf{hg rollback} +rolling back last transaction +$ \textbf{hg tip} +changeset: +tag: tip +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: First commit + +$ \textbf{hg status} +M a +? b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/rollback.status.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,9 @@ +$ \textbf{hg status} +? b +$ \textbf{hg tip} +changeset: +tag: tip +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Add file b +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/rollback.twice.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ +$ \textbf{hg rollback} +rolling back last transaction +$ \textbf{hg rollback} +no rollback information available
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.simple.changelog.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.simple.combine.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,6 @@ + + + + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.simple.compact.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,13 @@ + + + + + + + + + + + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.simple.datekeyword.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ + + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.simple.keywords.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.simple.manyfilters.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.simple.normal.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,7 @@ + + + + + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.simple.rev.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.simple.simplest.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.simple.simplesub.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,7 @@ + + + + + + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.svnstyle.id.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,1 @@ +$ \textbf{hg log -r0 --template '\{node\}'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.svnstyle.result.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,11 @@ +$ \textbf{hg log -r1 --style svn.style} +------------------------------------------------------------------------ + +r1 | bos + +added line to end of <<hello>> file. + +in addition, added a file with the helpful name (at least i hope that some +might consider it so) of goodbye. + +------------------------------------------------------------------------
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.svnstyle.short.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,10 @@ +$ \textbf{svn log -r9653} +------------------------------------------------------------------------ +r9653 | sean.hefty | 2006-09-27 14:39:55 -0700 (Wed, 27 Sep 2006) | 5 lines + +On reporting a route error, also include the status for the error, +rather than indicating a status of 0 when an error has occurred. + +Signed-off-by: Sean Hefty <sean.hefty@intel.com> + +------------------------------------------------------------------------
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.svnstyle.simplest.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ +$ \textbf{cat svn.style} +changeset = "\{node|short\}\textbackslash{}n" +$ \textbf{hg log -r1 --style svn.style} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.svnstyle.style.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{cat svn.style} +header = '------------------------------------------------------------------------\textbackslash{}n\textbackslash{}n' +changeset = svn.template
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.svnstyle.syntax.error.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{hg log -r1 --style broken.style} +abort: broken.style:1: parse error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.svnstyle.syntax.input.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{cat broken.style} +changeset =
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/template.svnstyle.template.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,6 @@ +$ \textbf{cat svn.template} +r\{rev\} | \{author|user\} | \{date|isodate\} (\{date|rfc822date\}) + +\{desc|strip|fill76\} + +------------------------------------------------------------------------
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour-merge-conflict.commit.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,15 @@ +$ \textbf{cat > letter.txt <<EOF} +> \textbf{Greetings!} +> \textbf{I am Bryan O'Sullivan, no relation of the former} +> \textbf{Nigerian dictator Sani Abacha.} +> \textbf{EOF} +$ \textbf{hg commit -m 'Send me your money'} +$ \textbf{hg tip} +changeset: +tag: tip +parent: +parent: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Send me your money +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour-merge-conflict.cousin.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,10 @@ +$ \textbf{cd ..} +$ \textbf{hg clone scam scam-cousin} +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +$ \textbf{cd scam-cousin} +$ \textbf{cat > letter.txt <<EOF} +> \textbf{Greetings!} +> \textbf{I am Shehu Musa Abacha, cousin to the former} +> \textbf{Nigerian dictator Sani Abacha.} +> \textbf{EOF} +$ \textbf{hg commit -m '419 scam, with cousin'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour-merge-conflict.merge.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,17 @@ +$ \textbf{export HGMERGE=merge} +$ \textbf{hg merge} +merging letter.txt +merge: warning: conflicts during merge +merging letter.txt failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +There are unresolved merges, you can redo the full merge using: + hg update -C 1 + hg merge 2 +$ \textbf{cat letter.txt} +Greetings! + +I am Shehu Musa Abacha, cousin to the former +======= +I am Alhaji Abba Abacha, son of the former + +Nigerian dictator Sani Abacha.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour-merge-conflict.pull.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,13 @@ +$ \textbf{cd ..} +$ \textbf{hg clone scam-cousin scam-merge} +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +$ \textbf{cd scam-merge} +$ \textbf{hg pull -u ../scam-son} +pulling from ../scam-son +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +not updating, since new heads added +(run 'hg heads' to see heads, 'hg merge' to merge)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour-merge-conflict.son.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,10 @@ +$ \textbf{cd ..} +$ \textbf{hg clone scam scam-son} +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +$ \textbf{cd scam-son} +$ \textbf{cat > letter.txt <<EOF} +> \textbf{Greetings!} +> \textbf{I am Alhaji Abba Abacha, son of the former} +> \textbf{Nigerian dictator Sani Abacha.} +> \textbf{EOF} +$ \textbf{hg commit -m '419 scam, with son'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour-merge-conflict.wife.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,7 @@ +$ \textbf{cat > letter.txt <<EOF} +> \textbf{Greetings!} +> \textbf{I am Mariam Abacha, the wife of former} +> \textbf{Nigerian dictator Sani Abacha.} +> \textbf{EOF} +$ \textbf{hg add letter.txt} +$ \textbf{hg commit -m '419 scam, first draft'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.clone-pull.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{cd ..} +$ \textbf{hg clone hello hello-pull} +2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.clone-push.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{cd ..} +$ \textbf{hg clone hello hello-push} +2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.clone.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,8 @@ +$ \textbf{hg clone http://hg.serpentine.com/tutorial/hello} +destination directory: hello +requesting all changes +adding changesets +adding manifests +adding file changes +added 5 changesets with 5 changes to 2 files +2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.commit-no-user.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,1 @@ +$ \textbf{hg commit}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.commit.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{hg commit} +nothing changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.diff.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,11 @@ +$ \textbf{hg diff} +diff -r hello.c + + +@@ -8,5 +8,6 @@ int main(int argc, char **argv) + int main(int argc, char **argv) + \{ + printf("hello, world!\textbackslash{}"); ++ printf("hello again!\textbackslash{}n"); + return 0; + \}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.help.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,18 @@ +$ \textbf{hg help init} +hg init [-e CMD] [--remotecmd CMD] [DEST] + +create a new repository in the given directory + + Initialize a new repository in the given directory. If the given + directory does not exist, it is created. + + If no directory is given, the current directory is used. + + It is possible to specify an ssh:// URL as the destination. + Look at the help text for the pull command for important details + about ssh:// URLs. + +options: + + -e --ssh specify ssh command to use + --remotecmd specify hg command to run on the remote side
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.incoming.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,9 @@ +$ \textbf{cd hello-pull} +$ \textbf{hg incoming ../my-hello} +searching for changes +changeset: +tag: tip +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Added an extra line of output +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.log-r.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,24 @@ +$ \textbf{hg log -r 3} +changeset: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Get make to generate the final binary from a .o file. + +$ \textbf{hg log -r } +changeset: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Get make to generate the final binary from a .o file. + +$ \textbf{hg log -r 1 -r 4} +changeset: +user: mpm@selenic.com + +summary: Create a makefile + +changeset: +tag: tip +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Trim comments. +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.log-v.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,9 @@ +$ \textbf{hg log -v -r 3} +changeset: +user: Bryan O'Sullivan <bos@serpentine.com> + +files: Makefile +description: +Get make to generate the final binary from a .o file. + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.log-vp.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,21 @@ +$ \textbf{hg log -v -p -r 2} +changeset: +user: Bryan O'Sullivan <bos@serpentine.com> + +files: hello.c +description: +Introduce a typo into hello.c. + + +diff -r -r hello.c + + +@@ -11,6 +11,6 @@ + + int main(int argc, char **argv) + \{ +- printf("hello, world!\textbackslash{}n"); ++ printf("hello, world!\textbackslash{}"); + return 0; + \} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.log.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,27 @@ +$ \textbf{hg log} +changeset: +tag: tip +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Trim comments. + +changeset: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Get make to generate the final binary from a .o file. + +changeset: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Introduce a typo into hello.c. + +changeset: +user: mpm@selenic.com + +summary: Create a makefile + +changeset: +user: mpm@selenic.com + +summary: Create a standard "hello, world" program +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.log.range.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,17 @@ +$ \textbf{hg log -r 2:4} +changeset: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Introduce a typo into hello.c. + +changeset: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Get make to generate the final binary from a .o file. + +changeset: +tag: tip +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Trim comments. +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.ls-a.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,3 @@ +$ \textbf{cd hello} +$ \textbf{ls -a} +. .. .hg Makefile hello.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.ls.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,5 @@ +$ \textbf{ls -l} +total 4 + +$ \textbf{ls hello} +Makefile hello.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.merge.cat.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,28 @@ +$ \textbf{cat hello.c} +/* + * Placed in the public domain by Bryan O'Sullivan. This program is + * not covered by patents in the United States or other countries. + */ + +#include <stdio.h> + +int main(int argc, char **argv) +\{ + printf("once more, hello.\textbackslash{}n"); + printf("hello, world!\textbackslash{}"); + return 0; +\} +$ \textbf{cat ../my-hello/hello.c} +/* + * Placed in the public domain by Bryan O'Sullivan. This program is + * not covered by patents in the United States or other countries. + */ + +#include <stdio.h> + +int main(int argc, char **argv) +\{ + printf("hello, world!\textbackslash{}"); + printf("hello again!\textbackslash{}n"); + return 0; +\}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.merge.clone.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,6 @@ +$ \textbf{cd ..} +$ \textbf{hg clone hello my-new-hello} +2 files updated, 0 files merged, 0 files removed, 0 files unresolved +$ \textbf{cd my-new-hello} +$ \textbf{sed -i '/printf/i\textbackslash{}\textbackslash{}tprintf("once more, hello.\textbackslash{}\textbackslash{}n");' hello.c} +$ \textbf{hg commit -m 'A new hello for a new day.'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.merge.commit.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,1 @@ +$ \textbf{hg commit -m 'Merged changes'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.merge.heads.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,13 @@ +$ \textbf{hg heads} +changeset: +tag: tip +parent: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Added an extra line of output + +changeset: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: A new hello for a new day. +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.merge.merge.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ +$ \textbf{hg merge} +merging hello.c +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.merge.parents.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,28 @@ +$ \textbf{hg parents} +changeset: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: A new hello for a new day. + +changeset: +tag: tip +parent: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Added an extra line of output + +$ \textbf{cat hello.c} +/* + * Placed in the public domain by Bryan O'Sullivan. This program is + * not covered by patents in the United States or other countries. + */ + +#include <stdio.h> + +int main(int argc, char **argv) +\{ + printf("once more, hello.\textbackslash{}n"); + printf("hello, world!\textbackslash{}"); + printf("hello again!\textbackslash{}n"); + return 0; +\}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.merge.pull.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,8 @@ +$ \textbf{hg pull ../my-hello} +pulling from ../my-hello +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +(run 'hg heads' to see heads, 'hg merge' to merge)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.merge.tip.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,9 @@ +$ \textbf{hg tip} +changeset: +tag: tip +parent: +parent: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Merged changes +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.merge.update.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,2 @@ +$ \textbf{hg update} +abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.older.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,10 @@ +$ \textbf{hg update 2} +2 files updated, 0 files merged, 0 files removed, 0 files unresolved +$ \textbf{hg parents} +changeset: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Introduce a typo into hello.c. + +$ \textbf{hg update} +2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.outgoing.net.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,8 @@ +$ \textbf{hg outgoing http://hg.serpentine.com/tutorial/hello} +searching for changes +changeset: +tag: tip +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Added an extra line of output +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.outgoing.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,9 @@ +$ \textbf{cd my-hello} +$ \textbf{hg outgoing ../hello-push} +searching for changes +changeset: +tag: tip +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Added an extra line of output +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.parents.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,7 @@ +$ \textbf{hg parents} +changeset: +tag: tip +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Added an extra line of output +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.pull.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,22 @@ +$ \textbf{hg tip} +changeset: +tag: tip +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Trim comments. + +$ \textbf{hg pull ../my-hello} +pulling from ../my-hello +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +(run 'hg update' to get a working copy) +$ \textbf{hg tip} +changeset: +tag: tip +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Added an extra line of output +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.push.net.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ +$ \textbf{hg push http://hg.serpentine.com/tutorial/hello} +pushing to http://hg.serpentine.com/tutorial/hello +searching for changes +ssl required
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.push.nothing.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ +$ \textbf{hg push ../hello-push} +pushing to ../hello-push +searching for changes +no changes found
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.push.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,7 @@ +$ \textbf{hg push ../hello-push} +pushing to ../hello-push +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.reclone.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ +$ \textbf{cd ..} +$ \textbf{hg clone hello my-hello} +2 files updated, 0 files merged, 0 files removed, 0 files unresolved +$ \textbf{cd my-hello}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.sed.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,1 @@ +$ \textbf{sed -i '/printf/a\textbackslash{}\textbackslash{}tprintf("hello again!\textbackslash{}\textbackslash{}n");' hello.c}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.status.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,4 @@ +$ \textbf{ls} +Makefile hello.c +$ \textbf{hg status} +M hello.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.tip.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,21 @@ +$ \textbf{hg tip -vp} +changeset: +tag: tip +user: Bryan O'Sullivan <bos@serpentine.com> + +files: hello.c +description: +Added an extra line of output + + +diff -r -r hello.c + + +@@ -8,5 +8,6 @@ int main(int argc, char **argv) + int main(int argc, char **argv) + \{ + printf("hello, world!\textbackslash{}"); ++ printf("hello again!\textbackslash{}n"); + return 0; + \} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.update.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,7 @@ +$ \textbf{grep printf hello.c} + printf("hello, world!\textbackslash{}"); +$ \textbf{hg update tip} +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +$ \textbf{grep printf hello.c} + printf("hello, world!\textbackslash{}"); + printf("hello again!\textbackslash{}n");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/tour.version.out Tue Mar 06 21:44:56 2007 -0800 @@ -0,0 +1,6 @@ +$ \textbf{hg version} +Mercurial Distributed SCM (version ) + +Copyright (C) 2005, 2006 Matt Mackall <mpm@selenic.com> +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.