1.1 --- a/.hgignore	Mon Apr 06 23:13:53 2009 -0700
     1.2 +++ b/.hgignore	Mon Apr 06 23:15:52 2009 -0700
     1.3 @@ -1,4 +1,4 @@
     1.4 -[^/]+/html/
     1.5 +[^/]+/htdocs/
     1.6  
     1.7  syntax: glob
     1.8  
     1.9 @@ -21,4 +21,11 @@
    1.10  web/hgbook/.database.sqlite3
    1.11  web/hgbook/secrets.py
    1.12  web/index-read.html.in
    1.13 -xsl/system-xsl
    1.14 +stylesheets/system-xsl
    1.15 +build
    1.16 +en/html
    1.17 +en/examples/results
    1.18 +tools
    1.19 +Makefile.vars
    1.20 +*.mo
    1.21 +*-tmp.*

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/Makefile	Mon Apr 06 23:15:52 2009 -0700
     2.3 @@ -0,0 +1,243 @@
     2.4 +#
     2.5 +# Makefile for the hgbook, top-level
     2.6 +#
     2.7 +include Makefile.vars
     2.8 +
     2.9 +FORMATS=html html-single pdf epub
    2.10 +
    2.11 +PO_LANGUAGES := zh
    2.12 +DBK_LANGUAGES := en
    2.13 +LANGUAGES := $(DBK_LANGUAGES) $(PO_LANGUAGES)
    2.14 +
    2.15 +UPDATEPO = PERLLIB=$(PO4A_LIB) $(PO4A_HOME)/po4a-updatepo -M UTF-8 \
    2.16 +	   -f docbook -o doctype=docbook -o includeexternal \
    2.17 +	   -o nodefault="<programlisting> <screen>" \
    2.18 +	   -o untranslated="<programlisting> <screen>"
    2.19 +TRANSLATE = PERLLIB=$(PO4A_LIB) $(PO4A_HOME)/po4a-translate -M UTF-8 \
    2.20 +	   -f docbook -o doctype=docbook -o includeexternal \
    2.21 +	   -o nodefault="<programlisting> <screen>" \
    2.22 +	   -o untranslated="<programlisting> <screen>" \
    2.23 +	   -k 0
    2.24 +
    2.25 +#rev_id = $(shell hg parents --template '{node|short} ({date|isodate})')
    2.26 +rev_id = $(shell hg parents --template '{node|short} ({date|shortdate})')
    2.27 +
    2.28 +images := \
    2.29 +	en/figs/feature-branches.png \
    2.30 +	en/figs/filelog.png \
    2.31 +	en/figs/metadata.png \
    2.32 +	en/figs/mq-stack.png \
    2.33 +	en/figs/revlog.png \
    2.34 +	en/figs/snapshot.png \
    2.35 +	en/figs/tour-history.png \
    2.36 +	en/figs/tour-merge-conflict.png \
    2.37 +	en/figs/tour-merge-merge.png \
    2.38 +	en/figs/tour-merge-pull.png \
    2.39 +	en/figs/tour-merge-sep-repos.png \
    2.40 +	en/figs/undo-manual-merge.png \
    2.41 +	en/figs/undo-manual.png \
    2.42 +	en/figs/undo-non-tip.png \
    2.43 +	en/figs/undo-simple.png \
    2.44 +	en/figs/wdir-after-commit.png \
    2.45 +	en/figs/wdir-branch.png \
    2.46 +	en/figs/wdir-merge.png \
    2.47 +	en/figs/wdir.png \
    2.48 +	en/figs/wdir-pre-branch.png
    2.49 +
    2.50 +help:
    2.51 +	@echo "  make epub         [LINGUA=en|zh|...]"
    2.52 +	@echo "  make html         [LINGUA=en|zh|...]"
    2.53 +	@echo "  make html-single  [LINGUA=en|zh|...]"
    2.54 +	@echo "  make pdf          [LINGUA=en|zh|...]"
    2.55 +	@echo "  make validate     [LINGUA=en|zh|...] # always before commit!"
    2.56 +	@echo "  make tidypo       [LINGUA=zh|...]    # always before commit!"
    2.57 +	@echo "  make updatepo     [LINGUA=zh|...]    # update po files."
    2.58 +	@echo "  make all          [LINGUA=en|zh|...]"
    2.59 +	@echo "  make stat         # print statistics about po files."
    2.60 +	@echo "  make clean        # Remove the build files."
    2.61 +
    2.62 +clean:
    2.63 +	@rm -fr build po/*.mo hello en/hello en/html en/.validated-00book.xml en/examples/.run en/examples/results \
    2.64 +          stylesheets/system-xsl en/figs/*-tmp.svg \
    2.65 +          en/figs/feature-branches.png \
    2.66 +          en/figs/filelog.png \
    2.67 +          en/figs/feature-branches.png \
    2.68 +          en/figs/filelog.png \
    2.69 +          en/figs/metadata.png \
    2.70 +          en/figs/mq-stack.png \
    2.71 +          en/figs/revlog.png \
    2.72 +          en/figs/snapshot.png \
    2.73 +          en/figs/tour-history.png \
    2.74 +          en/figs/tour-merge-conflict.png \
    2.75 +          en/figs/tour-merge-merge.png \
    2.76 +          en/figs/tour-merge-pull.png \
    2.77 +          en/figs/tour-merge-sep-repos.png \
    2.78 +          en/figs/undo-manual-merge.png \
    2.79 +          en/figs/undo-manual.png \
    2.80 +          en/figs/undo-non-tip.png \
    2.81 +          en/figs/undo-simple.png \
    2.82 +          en/figs/wdir-after-commit.png \
    2.83 +          en/figs/wdir-branch.png \
    2.84 +          en/figs/wdir-merge.png \
    2.85 +          en/figs/wdir-pre-branch.png \
    2.86 +          en/figs/wdir.png
    2.87 +
    2.88 +all:
    2.89 +ifdef LINGUA
    2.90 +	for f in $(FORMATS); do \
    2.91 +	  $(MAKE) LINGUA=$(LINGUA) $$f; \
    2.92 +	done
    2.93 +else
    2.94 +	for l in $(LANGUAGES); do \
    2.95 +	    for f in $(FORMATS); do \
    2.96 +		$(MAKE) LINGUA=$$l $$f; \
    2.97 +	    done; \
    2.98 +	done
    2.99 +endif
   2.100 +
   2.101 +stat:
   2.102 +	@( \
   2.103 +	LANG=C; export LANG; cd po; \
   2.104 +	for f in *.po; do \
   2.105 +	    printf "%s\t" $$f; \
   2.106 +	    msgfmt --statistics -c $$f; \
   2.107 +	done; \
   2.108 +	)
   2.109 +
   2.110 +tidypo:
   2.111 +ifdef LINGUA
   2.112 +	msgcat --sort-by-file --width=80 po/$(LINGUA).po > po/$(LINGUA).tmp && \
   2.113 +	    mv po/$(LINGUA).tmp po/$(LINGUA).po;
   2.114 +else
   2.115 +	for po in $(wildcard po/*.po); do \
   2.116 +	    msgcat --sort-by-file --width=80 $$po > $$po.tmp && mv $$po.tmp $$po; \
   2.117 +	done
   2.118 +endif
   2.119 +
   2.120 +ifndef LINGUA
   2.121 +updatepo:
   2.122 +	for l in $(PO_LANGUAGES); do \
   2.123 +	    $(MAKE) $@ LINGUA=$$l; \
   2.124 +	done
   2.125 +else
   2.126 +updatepo:
   2.127 +ifneq "$(findstring $(LINGUA),$(PO_LANGUAGES))" ""
   2.128 +	(cd po; \
   2.129 +	$(UPDATEPO) -m ../en/00book.xml -p $(LINGUA).po; \
   2.130 +	)
   2.131 +	$(MAKE) tidypo LINGUA=$(LINGUA)
   2.132 +endif
   2.133 +endif
   2.134 +
   2.135 +ifndef LINGUA
   2.136 +validate:
   2.137 +	for l in $(LANGUAGES); do \
   2.138 +	    $(MAKE) $@ LINGUA=$$l; \
   2.139 +	done
   2.140 +else
   2.141 +validate: build/$(LINGUA)/source/hgbook.xml
   2.142 +	xmllint --nonet --noout --postvalid --xinclude $<
   2.143 +
   2.144 +ifneq "$(findstring $(LINGUA),$(DBK_LANGUAGES))" ""
   2.145 +$(LINGUA)/examples/.run:
   2.146 +	(cd $(LINGUA)/examples; ./run-example -v -a)
   2.147 +
   2.148 +build/$(LINGUA)/source/hgbook.xml: $(wildcard $(LINGUA)/*.xml) $(images) $(LINGUA)/examples/.run
   2.149 +	mkdir -p build/$(LINGUA)/source/figs
   2.150 +	cp $(LINGUA)/figs/*.png build/$(LINGUA)/source/figs
   2.151 +	cp stylesheets/hgbook.css build/$(LINGUA)/source
   2.152 +	(cd $(LINGUA); xmllint --nonet --noent --xinclude --postvalid --output ../$@.tmp 00book.xml)
   2.153 +	cat $@.tmp | sed 's/\$$rev_id\$$/${rev_id}/' > $@
   2.154 +else
   2.155 +en/examples/.run:
   2.156 +	(cd en/examples; ./run-example -v -a)
   2.157 +
   2.158 +build/en/source/hgbook.xml:
   2.159 +	${MAKE} LINGUA=en $@
   2.160 +
   2.161 +build/$(LINGUA)/source/hgbook.xml: $(wildcard en/*.xml) po/$(LINGUA).po $(images)
   2.162 +	mkdir -p build/$(LINGUA)/source/figs
   2.163 +	cp en/figs/*.png build/$(LINGUA)/source/figs
   2.164 +	cp stylesheets/hgbook.css build/$(LINGUA)/source
   2.165 +	$(TRANSLATE) -m en/00book.xml -p po/$(LINGUA).po -l en/hgbook.xml.$(LINGUA)
   2.166 +	xmllint --nonet --noent --xinclude --postvalid --output $@.tmp en/hgbook.xml.$(LINGUA)
   2.167 +	cat $@.tmp | sed 's/\$$rev_id\$$/${rev_id}/' > $@
   2.168 +	mv en/hgbook.xml.$(LINGUA) build/$(LINGUA)/source
   2.169 +endif
   2.170 +
   2.171 +endif
   2.172 +
   2.173 +ifndef LINGUA
   2.174 +epub:
   2.175 +	for l in $(LANGUAGES); do \
   2.176 +	    $(MAKE) $@ LINGUA=$$l; \
   2.177 +	done
   2.178 +else
   2.179 +epub: build/$(LINGUA)/epub/hgbook.epub
   2.180 +
   2.181 +build/$(LINGUA)/epub/hgbook.epub: build/$(LINGUA)/source/hgbook.xml
   2.182 +	mkdir -p build/$(LINGUA)/epub
   2.183 +	(cd build/$(LINGUA)/source; $(DB2EPUB) -c hgbook.css -v hgbook.xml; mv hgbook.epub ../epub)
   2.184 +endif
   2.185 +
   2.186 +ifndef LINGUA
   2.187 +html:
   2.188 +	for l in $(LANGUAGES); do \
   2.189 +	    $(MAKE) $@ LINGUA=$$l; \
   2.190 +	done
   2.191 +else
   2.192 +html: build/$(LINGUA)/html/index.html
   2.193 +
   2.194 +build/$(LINGUA)/html/index.html: build/$(LINGUA)/source/hgbook.xml stylesheets/html.xsl stylesheets/$(LINGUA)/html.xsl
   2.195 +	mkdir -p build/$(LINGUA)/html/figs
   2.196 +	cp en/figs/*.png build/$(LINGUA)/html/figs
   2.197 +	cp stylesheets/hgbook.css build/$(LINGUA)/html
   2.198 +	xsltproc --output build/$(LINGUA)/html/ \
   2.199 +	    stylesheets/$(LINGUA)/html.xsl build/$(LINGUA)/source/hgbook.xml
   2.200 +endif
   2.201 +
   2.202 +ifndef LINGUA
   2.203 +html-single:
   2.204 +	for l in $(LANGUAGES); do \
   2.205 +	    $(MAKE) $@ LINGUA=$$l; \
   2.206 +	done
   2.207 +else
   2.208 +html-single: build/$(LINGUA)/html-single/hgbook.html
   2.209 +
   2.210 +build/$(LINGUA)/html-single/hgbook.html: build/$(LINGUA)/source/hgbook.xml stylesheets/html-single.xsl stylesheets/$(LINGUA)/html-single.xsl
   2.211 +	mkdir -p build/$(LINGUA)/html-single/figs
   2.212 +	cp en/figs/*.png build/$(LINGUA)/html-single/figs
   2.213 +	cp stylesheets/hgbook.css build/$(LINGUA)/html-single
   2.214 +	xsltproc --output build/$(LINGUA)/html-single/hgbook.html \
   2.215 +	    stylesheets/$(LINGUA)/html-single.xsl build/$(LINGUA)/source/hgbook.xml
   2.216 +endif
   2.217 +
   2.218 +ifndef LINGUA
   2.219 +pdf:
   2.220 +	for l in $(LANGUAGES); do \
   2.221 +	    $(MAKE) $@ LINGUA=$$l; \
   2.222 +	done
   2.223 +else
   2.224 +pdf: build/$(LINGUA)/pdf/hgbook.pdf
   2.225 +
   2.226 +build/$(LINGUA)/pdf/hgbook.pdf: build/$(LINGUA)/source/hgbook.xml stylesheets/fo.xsl stylesheets/$(LINGUA)/fo.xsl
   2.227 +	mkdir -p build/$(LINGUA)/pdf
   2.228 +	java -classpath $(JAVA_LIB)/saxon65.jar:$(JAVA_LIB)/saxon65-dbxsl.jar:$(JAVA_LIB)/xml-commons-resolver-1.2.jar:$(JAVA_LIB) \
   2.229 +	    com.icl.saxon.StyleSheet \
   2.230 +	    -x org.apache.xml.resolver.tools.ResolvingXMLReader \
   2.231 +	    -y org.apache.xml.resolver.tools.ResolvingXMLReader \
   2.232 +	    -r org.apache.xml.resolver.tools.CatalogResolver \
   2.233 +	    -o build/$(LINGUA)/source/hgbook.fo \
   2.234 +	    build/$(LINGUA)/source/hgbook.xml \
   2.235 +	    stylesheets/$(LINGUA)/fo.xsl \
   2.236 +	    fop1.extensions=1
   2.237 +
   2.238 +	(cd build/$(LINGUA)/source && $(FOP_HOME)/fop.sh -c $(FOP_HOME)/conf/userconfig.xml hgbook.fo ../pdf/hgbook.pdf)
   2.239 +endif
   2.240 +
   2.241 +en/figs/%.png: en/figs/%.svg en/fixsvg
   2.242 +	en/fixsvg $<
   2.243 +	inkscape -D -d 120 -e $@ $<-tmp.svg
   2.244 +
   2.245 +en/figs/%.svg: en/figs/%.dot
   2.246 +	dot -Tsvg -o $@ $<

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/Makefile.vars.tmpl	Mon Apr 06 23:15:52 2009 -0700
     3.3 @@ -0,0 +1,20 @@
     3.4 +#
     3.5 +# Please create your Makefile.vars file from this template file.
     3.6 +#
     3.7 +# Please use absolute path, DO NOT use relative path !
     3.8 +#
     3.9 +
    3.10 +# po4a (>= 0.36.1): Only for PO based Makefile !
    3.11 +# po4A_HOME=/usr/bin
    3.12 +# PO4A_LIB=/usr/share/perl5
    3.13 +PO4A_HOME=/home/dongsheng/var/svn/i18n-zh/trunk/lib/po4a
    3.14 +PO4A_LIB=$(PO4A_HOME)/lib
    3.15 +
    3.16 +# saxon65.jar, saxon65-dbxsl.jar, xml-commons-resolver-1.2.jar: Only for pdf format !
    3.17 +JAVA_LIB=/home/dongsheng/var/svn/i18n-zh/trunk/lib/share/java
    3.18 +
    3.19 +# fop (>= 0.9.6): Only for pdf format !
    3.20 +FOP_HOME=/home/dongsheng/var/svn/i18n-zh/trunk/lib/fop
    3.21 +
    3.22 +# docbook-xsl (>= 1.74.3): Only for ePub format !
    3.23 +DB2EPUB=/home/dongsheng/var/svn/i18n-zh/trunk/lib/docbook/docbook-xsl/epub/bin/dbtoepub

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/README.BUILD	Mon Apr 06 23:15:52 2009 -0700
     4.3 @@ -0,0 +1,99 @@
     4.4 +HOW-TO:  Compiling the Mercurial Book
     4.5 +======================================
     4.6 +
     4.7 +This Mercurial Book is written in DocBook 4.5.
     4.8 +
     4.9 +The goal of this document is to give simple instructions to anyone who
    4.10 +wants to compile this book into a useful format, like HTML or PDF.  It
    4.11 +should state *exactly* which tools to use, and how to invoke them, in
    4.12 +simplest terms.
    4.13 +
    4.14 +Table of Contents:
    4.15 +
    4.16 +  I. PRIMER
    4.17 + II. COMPILING THE DOCS
    4.18 +III. HACKING ON THE DOCS
    4.19 +
    4.20 +I. PRIMER
    4.21 +
    4.22 +  DocBook has a tortured, confusing history.  Before you do anything,
    4.23 +  take a look at Eric Raymond's excellent "DocBook Demystification HOWTO":
    4.24 +
    4.25 +      http://tldp.org/HOWTO/DocBook-Demystification-HOWTO/
    4.26 +
    4.27 +  It's very short and clears up many things.
    4.28 +
    4.29 +
    4.30 +II. COMPILING THE DOCS
    4.31 +
    4.32 +
    4.33 +1. Install XML DTD and XSL stylesheets for DocBook
    4.34 +
    4.35 +      % sudo apt-get install docbook-xml docbook-xsl
    4.36 +
    4.37 +2. Install libxml2-utils
    4.38 +
    4.39 +      % sudo apt-get install libxml2-utils
    4.40 +
    4.41 +3. Install graph drawing tools
    4.42 +
    4.43 +      % sudo apt-get install graphviz inkscape
    4.44 +
    4.45 +4. Install pdf support
    4.46 +
    4.47 +      % sudo apt-get install openjdk-6-jdk docbook-xsl-saxon libsaxon-java fop
    4.48 +
    4.49 +  The Makefile will actually invoke tools/fop/fop.sh, you should do
    4.50 +  some trick, let fop's CLASSPATH include saxon.jar and docbook-xsl-saxon.jar .
    4.51 +
    4.52 +5. Make
    4.53 +  Run 'make' for more details, for example:
    4.54 +
    4.55 +  * make all document(pdf, html and html-single for all languages)
    4.56 +      % make all
    4.57 +
    4.58 +  * make english document(pdf, html and html-single for all languages)
    4.59 +      % make LINGUA=en all
    4.60 +
    4.61 +  * make Chinese document(pdf, html and html-single for all languages)
    4.62 +      % make LINGUA=zh all
    4.63 +
    4.64 +  * make Chinese pdf document
    4.65 +      % make LINGUA=zh pdf
    4.66 +
    4.67 +III. HACKING ON THE DOCS
    4.68 +
    4.69 +In addition to everything in section II:
    4.70 +
    4.71 +
    4.72 +1. Get a nice editing environment for SGML/XML.
    4.73 +
    4.74 +  This isn't strictly required, but it's nice when your editor
    4.75 +  colorizes things, understands the DTD, tells you what tags you can
    4.76 +  insert, etc.
    4.77 +
    4.78 +  If you use emacs, we recommend the PSGML major-mode.  Most free
    4.79 +  operating systems package it, or its home page is here:
    4.80 +
    4.81 +      http://www.lysator.liu.se/projects/about_psgml.html
    4.82 +
    4.83 +  If you use vim, you might check out xmledit, at:
    4.84 +
    4.85 +      http://www.vim.org/scripts/script.php?script_id=301
    4.86 +
    4.87 +
    4.88 +2. Get a validating parser.
    4.89 +
    4.90 +  Actually, if you have what you need to compile the documentation,
    4.91 +  then you almost certainly have an XML validator installed already -
    4.92 +  it is called xmllint, and comes as part of libxml2.
    4.93 +
    4.94 +  The makefile is preconfigured with a suitable invocation of it,
    4.95 +  so simply run:
    4.96 +
    4.97 +      $ make validate
    4.98 +
    4.99 +3. Read about DocBook.
   4.100 +
   4.101 +  You'll want to get real intimate with a DocBook reference, such as
   4.102 +  can be found at:  http://www.docbook.org/tdg/en/html/

     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/contrib/hg-interdiff	Mon Apr 06 23:15:52 2009 -0700
     5.3 @@ -0,0 +1,45 @@
     5.4 +#!/usr/bin/env python
     5.5 +#
     5.6 +# Adapter for using interdiff with mercurial's extdiff extension.
     5.7 +#
     5.8 +# Copyright 2006 Bryan O'Sullivan <bos@serpentine.com>
     5.9 +#
    5.10 +# This software may be used and distributed according to the terms of
    5.11 +# the GNU General Public License, incorporated herein by reference.
    5.12 +
    5.13 +import os, sys
    5.14 +
    5.15 +def walk(base):
    5.16 +    # yield all non-directories below the base path.
    5.17 +    for root, dirs, files in os.walk(base):
    5.18 +        for f in files:
    5.19 +            path = os.path.join(root, f)
    5.20 +            yield path[len(base)+1:], path
    5.21 +    else:
    5.22 +        if os.path.isfile(base):
    5.23 +            yield '', base
    5.24 +
    5.25 +# create list of unique file names under both directories.
    5.26 +files = dict(walk(sys.argv[1]))
    5.27 +files.update(walk(sys.argv[2]))
    5.28 +files = files.keys()
    5.29 +files.sort()
    5.30 +
    5.31 +def name(base, f):
    5.32 +    if f:
    5.33 +        path = os.path.join(base, f)
    5.34 +    else:
    5.35 +        path = base
    5.36 +    # interdiff requires two files; use /dev/null if one is missing.
    5.37 +    if os.path.exists(path):
    5.38 +        return path
    5.39 +    return '/dev/null'
    5.40 +
    5.41 +ret = 0
    5.42 +
    5.43 +for f in files:
    5.44 +    if os.system('interdiff "%s" "%s"' % (name(sys.argv[1], f),
    5.45 +                                          name(sys.argv[2], f))):
    5.46 +        ret = 1
    5.47 +
    5.48 +sys.exit(ret)

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/contrib/hg-package	Mon Apr 06 23:15:52 2009 -0700
     6.3 @@ -0,0 +1,80 @@
     6.4 +#!/bin/sh
     6.5 +
     6.6 +build_dir=`dirname "$0"`/../build
     6.7 +rev_id=`hg parents --template '{date|shortdate}' | sed 's/-//g'`
     6.8 +
     6.9 +for l in en zh; do
    6.10 +  (
    6.11 +  if [ ! -d "${build_dir}/${l}" ] ; then
    6.12 +    continue
    6.13 +  fi
    6.14 +
    6.15 +  cd ${build_dir}/${l};
    6.16 +
    6.17 +  f='html'
    6.18 +  if [ -f "${f}/index.html" ] ; then
    6.19 +     d=hgbook-${l}-${f}
    6.20 +     rm -fr ${d} && cp -r ${f} ${d} && tar czf ../${d}-${rev_id}.tar.gz ${d}
    6.21 +  fi
    6.22 +
    6.23 +  f='html-single'
    6.24 +  if [ -f "${f}/hgbook.html" ] ; then
    6.25 +     d=hgbook-${l}-${f}
    6.26 +     rm -fr ${d} && cp -r ${f} ${d} && tar czf ../${d}-${rev_id}.tar.gz ${d}
    6.27 +  fi
    6.28 +
    6.29 +  if [ -f "pdf/hgbook.pdf" ] ; then
    6.30 +     cp pdf/hgbook.pdf ../hgbook-${l}-${rev_id}.pdf
    6.31 +     gzip -f9 ../hgbook-${l}-${rev_id}.pdf
    6.32 +  fi
    6.33 +
    6.34 +  if [ -f "epub/hgbook.epub" ] ; then
    6.35 +     cp epub/hgbook.epub ../hgbook-${l}-${rev_id}.epub
    6.36 +  fi
    6.37 +  )
    6.38 +done
    6.39 +
    6.40 +upload_pass=$1
    6.41 +upload_user=$2
    6.42 +
    6.43 +# echo "upload_pass: ${upload_pass}"
    6.44 +# echo "upload_user: ${upload_user}"
    6.45 +
    6.46 +if [ "${upload_user}x" == "x" ]; then
    6.47 +  upload_user="dongsheng.song"
    6.48 +fi
    6.49 +
    6.50 +if [ "${upload_pass}x" != "x" ]; then
    6.51 +  (
    6.52 +  cd ${build_dir}
    6.53 +  curl -s -O http://support.googlecode.com/svn/trunk/scripts/googlecode_upload.py
    6.54 +  if [[ "0" != $? ]]; then
    6.55 +    exit 1
    6.56 +  fi
    6.57 +
    6.58 +  for l in en zh; do
    6.59 +    if [ -f "hgbook-${l}-${rev_id}.epub" ] ; then
    6.60 +      python googlecode_upload.py --user="${upload_user}" --password="${upload_pass}" \
    6.61 +          -p "i18n-zh" -l "Type-Docs,book,hgbook,hg,mercurial,ebook" \
    6.62 +          -s "Distributed revision control with Mercurial - ${l} - ePub" \
    6.63 +          hgbook-${l}-${rev_id}.epub
    6.64 +    fi
    6.65 +
    6.66 +    if [ -f "hgbook-${l}-${rev_id}.pdf.gz" ] ; then
    6.67 +      python googlecode_upload.py --user="${upload_user}" --password="${upload_pass}" \
    6.68 +          -p "i18n-zh" -l "Type-Docs,book,hgbook,hg,mercurial" \
    6.69 +          -s "Distributed revision control with Mercurial - ${l} - pdf" \
    6.70 +          hgbook-${l}-${rev_id}.pdf.gz
    6.71 +    fi
    6.72 +
    6.73 +    for f in html html-single; do
    6.74 +      if [ -f "hgbook-${l}-${f}-${rev_id}.tar.gz" ] ; then
    6.75 +        python googlecode_upload.py --user="${upload_user}" --password="${upload_pass}" \
    6.76 +            -p "i18n-zh" -l "Type-Docs,book,hgbook,hg,mercurial" \
    6.77 +            -s "Distributed revision control with Mercurial - ${l} - ${f}" \
    6.78 +            hgbook-${l}-${f}-${rev_id}.tar.gz
    6.79 +      fi
    6.80 +    done
    6.81 +  done
    6.82 +  )
    6.83 +fi

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/contrib/hg-replay	Mon Apr 06 23:15:52 2009 -0700
     7.3 @@ -0,0 +1,107 @@
     7.4 +#!/usr/bin/env python
     7.5 +#
     7.6 +# Adapter for using interdiff with mercurial's extdiff extension.
     7.7 +#
     7.8 +# Copyright 2006 Bryan O'Sullivan <bos@serpentine.com>
     7.9 +#
    7.10 +# This software may be used and distributed according to the terms of
    7.11 +# the GNU General Public License, incorporated herein by reference.
    7.12 +
    7.13 +import os
    7.14 +import shutil
    7.15 +import sys
    7.16 +import tempfile
    7.17 +
    7.18 +if len(sys.argv) < 4:
    7.19 +    print >> sys.stderr, ('usage: %s srcrepo destrepo cset-to-omit [...]' %
    7.20 +                          os.path.basename(sys.argv[0]))
    7.21 +    sys.exit(1)
    7.22 +
    7.23 +srcrepo, destrepo = sys.argv[1], sys.argv[2]
    7.24 +omit = sys.argv[3:]
    7.25 +    
    7.26 +changemap = {}
    7.27 +revs = []
    7.28 +
    7.29 +parent = None
    7.30 +
    7.31 +sys.stdout.write('gathering history...')
    7.32 +sys.stdout.flush()
    7.33 +
    7.34 +for line in os.popen("hg --cwd %r log -r0:tip --template '{rev}:{node} {parents}\n'" % srcrepo):
    7.35 +    changes = line.split()
    7.36 +    cset = changes[0].split(':')[1]
    7.37 +    rev = len(revs)
    7.38 +    changemap[cset] = rev
    7.39 +    if len(changes) >= 2:
    7.40 +        p1 = int(changes[1].split(':', 1)[0])
    7.41 +    if len(changes) == 3:
    7.42 +        p2 = int(changes[2].split(':', 1)[0])
    7.43 +    else:
    7.44 +        p2 = None
    7.45 +    if len(changes) == 1:
    7.46 +        p1 = parent
    7.47 +    revs.append((cset, p1, p2))
    7.48 +    parent = rev
    7.49 +
    7.50 +sys.stdout.write(' %d revs\n' % len(revs))
    7.51 +
    7.52 +def findrev(r):
    7.53 +    try:
    7.54 +        i = int(r)
    7.55 +        if str(i) == r:
    7.56 +            rev = i
    7.57 +        if rev < 0:
    7.58 +            rev += len(revs)
    7.59 +        if rev < 0 or rev > len(revs):
    7.60 +            print >> sys.stderr, 'bad changeset: %r' % r
    7.61 +            sys.exit(1)
    7.62 +        cset = revs[rev][0]
    7.63 +    except ValueError:
    7.64 +        cset = r
    7.65 +        matches = [changemap[c] for c in changemap if c.startswith(cset)]
    7.66 +        if len(matches) != 1:
    7.67 +            print >> sys.stderr, 'bad changeset: %r' % r
    7.68 +            sys.exit(1)
    7.69 +        rev = matches[0]
    7.70 +    return rev
    7.71 +
    7.72 +def run(cmd):
    7.73 +    print cmd
    7.74 +    ret = os.system(cmd)
    7.75 +    if ret:
    7.76 +        print >> sys.stderr, 'failure:', cmd
    7.77 +        sys.exit(1)
    7.78 +
    7.79 +omit = map(findrev, omit)
    7.80 +omit.sort()
    7.81 +newrevs = revs[:omit[0]]
    7.82 +tip = len(newrevs) - 1
    7.83 +run('hg clone -q -r%s %r %r' % (tip, srcrepo, destrepo))
    7.84 +    
    7.85 +os.environ['HGMERGE'] = 'true'
    7.86 +
    7.87 +patchdir = tempfile.mkdtemp(prefix='replay.')
    7.88 +try:
    7.89 +    run('hg --cwd %r export --git -o %r%s%%R %d:tip' %
    7.90 +        (srcrepo, patchdir, os.sep, omit[0]+1))
    7.91 +    for rev in xrange(omit[0], len(revs)):
    7.92 +        if rev in omit:
    7.93 +            print 'omit', rev
    7.94 +            newrevs.append((None, revs[rev][1], None))
    7.95 +            continue
    7.96 +        _, p1, p2 = revs[rev]
    7.97 +        np1 = newrevs[p1][1]
    7.98 +        if tip != np1:
    7.99 +            run('hg --cwd %r update -q -C %s' % (destrepo, np1))
   7.100 +        np2 = None
   7.101 +        if p2:
   7.102 +            np2 = newrevs[p2][1]
   7.103 +            run('hg --cwd %r merge -q %s' % (destrepo, np2))
   7.104 +            print >> sys.stderr, 'XXX - cannot handle merges properly yet'
   7.105 +        run('hg --cwd %r import -q -f %r%s%d' % (destrepo, patchdir, os.sep, rev))
   7.106 +        tip = len(newrevs) - 1
   7.107 +        newrevs.append((None, tip, np2))
   7.108 +finally:
   7.109 +    print 'cleaning up ...'
   7.110 +    #shutil.rmtree(patchdir)

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/contrib/latex-to-docbook	Mon Apr 06 23:15:52 2009 -0700
     8.3 @@ -0,0 +1,198 @@
     8.4 +#!/usr/bin/python
     8.5 +#
     8.6 +# This is the most horrible of hacks. Pretend you're not looking.</para>
     8.7 +
     8.8 +import cStringIO as StringIO
     8.9 +import re, sys
    8.10 +
    8.11 +sections = {
    8.12 +    'chapter': 'chapter',
    8.13 +    'section': 'sect1',
    8.14 +    'subsection': 'sect2',
    8.15 +    'subsubsection': 'sect3',
    8.16 +    }
    8.17 +
    8.18 +envs = {
    8.19 +    'codesample2': 'programlisting',
    8.20 +    'codesample4': 'programlisting',
    8.21 +    'enumerate': 'orderedlist',
    8.22 +    'figure': 'informalfigure',
    8.23 +    'itemize': 'itemizedlist',
    8.24 +    'note': 'note',
    8.25 +    'quote': 'blockquote',
    8.26 +    }
    8.27 +
    8.28 +def process(ifp, ofp):
    8.29 +    print >> ofp, '<!-- vim: set filetype=docbkxml shiftwidth=2 autoindent expandtab tw=77 : -->\n'
    8.30 +    stack = []
    8.31 +    para = True
    8.32 +    inlist = 0
    8.33 +    for line in ifp:
    8.34 +        if line.startswith('%%% Local Variables:'):
    8.35 +            break
    8.36 +        line = (line.rstrip()
    8.37 +                .replace('~', ' ')
    8.38 +                .replace('&', '&amp;')
    8.39 +                .replace('---', '&emdash;')
    8.40 +                .replace('\_', '_')
    8.41 +                .replace('\{', '{')
    8.42 +                .replace('\}', '}')
    8.43 +                .replace('\$', '$')
    8.44 +                .replace('\%', '%')
    8.45 +                .replace('\#', '#')
    8.46 +                .replace('<', '&lt;')
    8.47 +                .replace('>', '&gt;')
    8.48 +                .replace('``', '<quote>')
    8.49 +                .replace("''", '</quote>')
    8.50 +                .replace('\\', '\\'))
    8.51 +        line = re.sub(r'\s*\\(?:centering|small)\b\s*', '', line)
    8.52 +        line = re.sub(r'\\(?:hgrc\\|hgrc)\b',
    8.53 +                      r'<filename role="special"> /.hgrc</filename>', line)
    8.54 +        line = re.sub(r'\\item\[(?P<key>[^]]+)\]', r'\item \g<key>:', line)
    8.55 +        line = re.sub(r'\\bug{(?P<id>\d+)}',
    8.56 +                      r'<ulink role="hg-bug" url="http://www.selenic.com/mercurial/bts/issue\g<id>">issue \g<id></ulink>', line)
    8.57 +        line = re.sub(r'\\cite{([^}]+)}', r'<citation>\1</citation>', line)
    8.58 +        line = re.sub(r'\\hggopt{(?P<opt>[^}]+)}',
    8.59 +                      r'<option role="hg-opt-global">\g<opt></option>', line)
    8.60 +        line = re.sub(r'\\hgxopt{(?P<ext>[^}]+)}{(?P<cmd>[^}]+)}{(?P<opt>[^}]+)}',
    8.61 +                      r'<option role="hg-ext-\g<ext>-cmd-\g<cmd>-opt">\g<opt></option>', line)
    8.62 +        line = re.sub(r'\\hgxcmd{(?P<ext>[^}]+)}{(?P<cmd>[^}]+)}',
    8.63 +                      r'<command role="hg-ext-\g<ext>">\g<cmd></command>', line)
    8.64 +        line = re.sub(r'\\hgext{(?P<ext>[^}]+)}',
    8.65 +                      r'<literal role="hg-ext">\g<ext></literal>', line)
    8.66 +        line = re.sub(r'\\hgopt{(?P<cmd>[^}]+)}{(?P<opt>[^}]+)}',
    8.67 +                      r'<option role="hg-opt-\g<cmd>">\g<opt></option>',
    8.68 +                      line)
    8.69 +        line = re.sub(r'\\cmdopt{(?P<cmd>[^}]+)}{(?P<opt>[^}]+)}',
    8.70 +                      r'<option role="cmd-opt-\g<cmd>">\g<opt></option>',
    8.71 +                      line)
    8.72 +        line = re.sub(r'\\hgcmd{(?P<cmd>[^}]+)}',
    8.73 +                      r'<command role="hg-cmd">hg \g<cmd></command>', line)
    8.74 +        line = re.sub(r'\\caption{(?P<text>[^}]+?)}',
    8.75 +                      r'<caption><para>\g<text></para></caption>', line)
    8.76 +        line = re.sub(r'\\grafix{(?P<name>[^}]+)}',
    8.77 +                      r'<mediaobject><imageobject><imagedata fileref="\g<name>"/></imageobject><textobject><phrase>XXX add text</phrase></textobject></mediaobject>', line)
    8.78 +        line = re.sub(r'\\envar{(?P<name>[^}]+)}',
    8.79 +                      r'<envar>\g<name></envar>', line)
    8.80 +        line = re.sub(r'\\rcsection{(?P<sect>[^}]+)}',
    8.81 +                      r'<literal role="rc-\g<sect>">\g<sect></literal>', line)
    8.82 +        line = re.sub(r'\\rcitem{(?P<sect>[^}]+)}{(?P<name>[^}]+)}',
    8.83 +                      r'<envar role="rc-item-\g<sect>">\g<name></envar>', line)
    8.84 +        line = re.sub(r'\\dirname{(?P<dir>[^}]+?)}',
    8.85 +                      r'<filename class="directory">\g<dir></filename>', line)
    8.86 +        line = re.sub(r'\\filename{(?P<file>[^}]+?)}',
    8.87 +                      r'<filename>\g<file></filename>', line)
    8.88 +        line = re.sub(r'\\tildefile{(?P<file>[^}]+)}',
    8.89 +                      r'<filename role="home">~/\g<file></filename>', line)
    8.90 +        line = re.sub(r'\\sfilename{(?P<file>[^}]+)}',
    8.91 +                      r'<filename role="special">\g<file></filename>', line)
    8.92 +        line = re.sub(r'\\sdirname{(?P<dir>[^}]+)}',
    8.93 +                      r'<filename role="special" class="directory">\g<dir></filename>', line)
    8.94 +        line = re.sub(r'\\interaction{(?P<id>[^}]+)}',
    8.95 +                      r'<!-- &interaction.\g<id>; -->', line)
    8.96 +        line = re.sub(r'\\excode{(?P<id>[^}]+)}',
    8.97 +                      r'<!-- &example.\g<id>; -->', line)
    8.98 +        line = re.sub(r'\\pymod{(?P<mod>[^}]+)}',
    8.99 +                      r'<literal role="py-mod">\g<mod></literal>', line)
   8.100 +        line = re.sub(r'\\pymodclass{(?P<mod>[^}]+)}{(?P<class>[^}]+)}',
   8.101 +                      r'<literal role="py-mod-\g<mod>">\g<class></literal>', line)
   8.102 +        line = re.sub(r'\\url{(?P<url>[^}]+)}',
   8.103 +                      r'<ulink url="\g<url>">\g<url></ulink>', line)
   8.104 +        line = re.sub(r'\\href{(?P<url>[^}]+)}{(?P<text>[^}]+)}',
   8.105 +                      r'<ulink url="\g<url>">\g<text></ulink>', line)
   8.106 +        line = re.sub(r'\\command{(?P<cmd>[^}]+)}',
   8.107 +                      r'<command>\g<cmd></command>', line)
   8.108 +        line = re.sub(r'\\option{(?P<opt>[^}]+)}',
   8.109 +                      r'<option>\g<opt></option>', line)
   8.110 +        line = re.sub(r'\\ref{(?P<id>[^}]+)}', r'<xref linkend="\g<id>"/>', line)
   8.111 +        line = re.sub(r'\\emph{(?P<txt>[^}]+)}',
   8.112 +                      r'<emphasis>\g<txt></emphasis>', line)
   8.113 +        line = re.sub(r'\\texttt{(?P<txt>[^}]+)}',
   8.114 +                      r'<literal>\g<txt></literal>', line)
   8.115 +        line = re.sub(r'\\textbf{(?P<txt>[^}]+)}',
   8.116 +                      r'<emphasis role="bold">\g<txt></emphasis>', line)
   8.117 +        line = re.sub(r'\\hook{(?P<name>[^}]+)}',
   8.118 +                      r'<literal role="hook">\g<name></literal>', line)
   8.119 +        line = re.sub(r'\\tplfilter{(?P<name>[^}]+)}',
   8.120 +                      r'<literal role="template-filter">\g<name></literal>', line)
   8.121 +        line = re.sub(r'\\tplkword{(?P<name>[^}]+)}',
   8.122 +                      r'<literal role="template-keyword">\g<name></literal>', line)
   8.123 +        line = re.sub(r'\\tplkwfilt{(?P<tpl>[^}]+)}{(?P<name>[^}]+)}',
   8.124 +                      r'<literal role="template-kw-filt-\g<tpl>">\g<name></literal>', line)
   8.125 +        line = re.sub(r'\\[vV]erb(.)(?P<txt>[^\1]+?)\1',
   8.126 +                      r'<literal>\g<txt></literal>', line)
   8.127 +        line = re.sub(r'\\package{(?P<name>[^}]+)}',
   8.128 +                      r'<literal role="package">\g<name></literal>', line)
   8.129 +        line = re.sub(r'\\hgcmdargs{(?P<cmd>[^}]+)}{(?P<args>[^}]+)}',
   8.130 +                      r'<command role="hg-cmd">hg \g<cmd> \g<args></command>',
   8.131 +                      line)
   8.132 +        line = re.sub(r'\\cmdargs{(?P<cmd>[^}]+)}{(?P<args>[^}]+)}',
   8.133 +                      r'<command>\g<cmd> \g<args></command>',
   8.134 +                      line)
   8.135 +        m = re.match(r'\\(chapter|section|subsection|subsubsection){(.*)}', line)
   8.136 +        if m:
   8.137 +            kind, content = m.groups()
   8.138 +            sec = sections[kind]
   8.139 +            while stack and stack[-1] >= sec:
   8.140 +                close = stack.pop()
   8.141 +                print >> ofp, '</%s>' % close
   8.142 +            stack.append(sec)
   8.143 +            print >> ofp, '<%s>\n<title>%s</title>' % (sec, content)
   8.144 +        else:
   8.145 +            m = re.match(r'\s*\\(begin|end){(?P<sect>[^}]+)}', line)
   8.146 +            if m:
   8.147 +                if not para:
   8.148 +                    print >> ofp, '</para>'
   8.149 +                    if inlist:
   8.150 +                        ofp.write('</listitem>')
   8.151 +                    para = True
   8.152 +                state, env = m.groups()
   8.153 +                env = envs[env]
   8.154 +                if state == 'begin':
   8.155 +                    ofp.write('<')
   8.156 +                    if env in ('itemizedlist', 'orderedlist'):
   8.157 +                        inlist = 1
   8.158 +                else:
   8.159 +                    ofp.write('</')
   8.160 +                    if env in ('itemizedlist', 'orderedlist'):
   8.161 +                        inlist = 0
   8.162 +                print >> ofp, env + '>'
   8.163 +            else:
   8.164 +                if line.startswith('\\item '):
   8.165 +                    if inlist > 1:
   8.166 +                        print >> ofp, '</para>'
   8.167 +                        print >> ofp, '</listitem>'
   8.168 +                    else:
   8.169 +                        inlist = 2
   8.170 +                    para = True
   8.171 +                    line = line[6:]
   8.172 +                if line and para:
   8.173 +                    if inlist:
   8.174 +                        ofp.write('<listitem>')
   8.175 +                    ofp.write('<para>')
   8.176 +                    para = False
   8.177 +                if not line and not para:
   8.178 +                    print >> ofp, '</para>'
   8.179 +                    if inlist:
   8.180 +                        ofp.write('</listitem>')
   8.181 +                    para = True
   8.182 +                print >> ofp, line
   8.183 +    while stack:
   8.184 +        print >> ofp, '</%s>' % stack.pop()
   8.185 +    ofp.write('\n'.join(['\n<!--',
   8.186 +                         'local variables: ',
   8.187 +                         'sgml-parent-document: ("00book.xml" "book" "chapter")',
   8.188 +                         'end:',
   8.189 +                         '-->']))
   8.190 +
   8.191 +
   8.192 +if __name__ == '__main__':
   8.193 +    for name in sys.argv[1:]:
   8.194 +        if not name.endswith('.tex'):
   8.195 +            continue
   8.196 +        newname = name[:-3] + 'xml'
   8.197 +        ofp = StringIO.StringIO()
   8.198 +        process(open(name), ofp)
   8.199 +        s = ofp.getvalue()
   8.200 +        s = re.sub('\n+</para>', '</para>', s, re.M)
   8.201 +        open(newname, 'w').write(s)

     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/contrib/sillybench.py	Mon Apr 06 23:15:52 2009 -0700
     9.3 @@ -0,0 +1,177 @@
     9.4 +#!/usr/bin/python
     9.5 +#
     9.6 +# Silly benchmarking program, to give a vague idea of how fast a few
     9.7 +# tools are on a handful of common operations.
     9.8 +#
     9.9 +# Use a fairly big and real source tarball to test with: Firefox
    9.10 +# 2.0.0.3 (37622 files, 5374 directories, 343MB unpacked onto
    9.11 +# 4KB-blocksize ext3).
    9.12 +
    9.13 +import csv
    9.14 +import os
    9.15 +import shutil
    9.16 +import sys
    9.17 +import tempfile
    9.18 +import time
    9.19 +import urllib2
    9.20 +
    9.21 +url = 'ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.3/source/firefox-2.0.0.3-source.tar.bz2'
    9.22 +
    9.23 +class CommandFailure(Exception):
    9.24 +    pass
    9.25 +
    9.26 +class rcs(object):
    9.27 +    def __init__(self):
    9.28 +        self.logfp = open(self.__class__.__name__ + '.csv', 'w')
    9.29 +        self.csv = csv.writer(self.logfp)
    9.30 +
    9.31 +    def download(self):
    9.32 +        name = url[url.rfind('/')+1:]
    9.33 +        path = os.path.join(os.environ['HOME'], name)
    9.34 +        if not os.path.isfile(path):
    9.35 +            ofp = open(path + '.part', 'wb')
    9.36 +            try:
    9.37 +                ifp = urllib2.urlopen(url)
    9.38 +                nbytes = ifp.info()['content-length']
    9.39 +                sys.stdout.write('%s: %s bytes ' % (name, nbytes))
    9.40 +                sys.stdout.flush()
    9.41 +                while True:
    9.42 +                    data = ifp.read(131072)
    9.43 +                    if not data: break
    9.44 +                    sys.stdout.write('.')
    9.45 +                    sys.stdout.flush()
    9.46 +                    ofp.write(data)
    9.47 +                del ofp
    9.48 +                os.rename(path + '.part', path)
    9.49 +            except:
    9.50 +                if os.path.exists(path + '.part'):
    9.51 +                    os.unlink(path + '.part')
    9.52 +                if os.path.exists(path):
    9.53 +                    os.unlink(path)
    9.54 +                raise
    9.55 +        return path
    9.56 +
    9.57 +    def run(self, args, mustsucceed=True):
    9.58 +        ret = os.spawnvp(os.P_WAIT, args[0], args)
    9.59 +        if ret < 0:
    9.60 +            msg = 'killed by signal %d' % (-ret)
    9.61 +        if ret > 0:
    9.62 +            msg = 'exited with status %d' % (ret)
    9.63 +        if ret:
    9.64 +            if mustsucceed:
    9.65 +                raise CommandFailure('%s: %s' % (msg, ' '.join(args)))
    9.66 +            print >> sys.stderr, 'WARNING: %s: %s' % (msg, ' '.join(args))
    9.67 +
    9.68 +    def time(self, *args, **kwargs):
    9.69 +        start = time.time()
    9.70 +        self.run(*args, **kwargs)
    9.71 +        end = time.time()
    9.72 +        return end - start
    9.73 +        
    9.74 +    def logtime(self, name, elapsed, rest=[]):
    9.75 +        self.log('time:' + name, '%.3f' % elapsed, rest)
    9.76 +
    9.77 +    def log(self, name, value, rest=[]):
    9.78 +        item = (name, value, repr(rest))
    9.79 +        print ' '.join(item)
    9.80 +        self.csv.writerow(item)
    9.81 +        self.logfp.flush()
    9.82 +
    9.83 +    def unpack(self):
    9.84 +        tarball = self.download()
    9.85 +        t = self.time(['tar', '-C', self.wdir, '-jxf', tarball])
    9.86 +        self.logtime('internal:untar', t)
    9.87 +        for name in os.listdir(os.path.join(self.wdir, 'mozilla')):
    9.88 +            os.rename(os.path.join(self.wdir, 'mozilla', name),
    9.89 +                      os.path.join(self.wdir, name))
    9.90 +
    9.91 +    def cleanup(self):
    9.92 +        pass
    9.93 +
    9.94 +    def add(self, paths):
    9.95 +        pass
    9.96 +
    9.97 +    def commit(self, msg, paths):
    9.98 +        pass
    9.99 +
   9.100 +    def status(self, path):
   9.101 +        pass
   9.102 +
   9.103 +    def remove(self, path):
   9.104 +        pass
   9.105 +
   9.106 +
   9.107 +class subversion(rcs):
   9.108 +    def __init__(self, root):
   9.109 +        rcs.__init__(self)
   9.110 +        self.repo = os.path.join(root, 'repo')
   9.111 +        self.wdir = os.path.join(root, 'wc')
   9.112 +        create = self.time(['svnadmin', 'create', '--fs-type=fsfs', self.repo])
   9.113 +        self.logtime('svn:create', create)
   9.114 +        co = self.time(['svn', 'co', 'file://' + self.repo, self.wdir])
   9.115 +        self.logtime('svn:co', co)
   9.116 +        self.logtime('init', create + co)
   9.117 +        os.chdir(self.wdir)
   9.118 +
   9.119 +    def dropmeta(self, names):
   9.120 +        return [n for n in names if os.path.basename(n) != '.svn']
   9.121 +
   9.122 +    def add(self, paths):
   9.123 +        t = self.time(['svn', 'add', '-q'] + paths)
   9.124 +        self.logtime('add %r' % paths, t)
   9.125 +
   9.126 +    def commit(self, msg, paths=[]):
   9.127 +        if paths:
   9.128 +            t = self.time(['svn', 'ci', '-q', '-m', msg] + paths)
   9.129 +        else:
   9.130 +            t = self.time(['svn', 'ci', '-q', '-m', msg])
   9.131 +        self.logtime('commit %r' % paths, t)
   9.132 +
   9.133 +
   9.134 +class mercurial(rcs):
   9.135 +    def __init__(self, root):
   9.136 +        rcs.__init__(self)
   9.137 +        self.repo = os.path.join(root, 'repo')
   9.138 +        self.wdir = self.repo
   9.139 +        init = self.time(['hg', 'init', self.repo])
   9.140 +        self.logtime('init', init)
   9.141 +        os.chdir(self.wdir)
   9.142 +
   9.143 +    def dropmeta(self, names):
   9.144 +        return [n for n in names if os.path.basename(n) != '.hg']
   9.145 +
   9.146 +    def add(self, paths):
   9.147 +        t = self.time(['hg', 'add', '-q'] + paths)
   9.148 +        self.logtime('add %r' % paths, t)
   9.149 +
   9.150 +    def commit(self, msg, paths=[]):
   9.151 +        if paths:
   9.152 +            t = self.time(['hg', 'ci', '-q', '-m', msg] + paths)
   9.153 +        else:
   9.154 +            t = self.time(['hg', 'ci', '-q', '-m', msg])
   9.155 +        self.logtime('commit %r' % paths, t)
   9.156 +
   9.157 +def benchmark(cls):
   9.158 +    oldcwd = os.getcwd()
   9.159 +    root = tempfile.mkdtemp(prefix='sillybench.')
   9.160 +    try:
   9.161 +        print 'root', root
   9.162 +        inst = cls(root)
   9.163 +        inst.unpack()
   9.164 +        names = inst.dropmeta(os.listdir('.'))
   9.165 +        dirs = [n for n in names if os.path.isdir(n)]
   9.166 +        nondirs = [n for n in names if not os.path.isdir(n)]
   9.167 +        dirs.sort(key=hash)
   9.168 +        names.sort(key=hash)
   9.169 +        for d in dirs[:len(dirs)/2]:
   9.170 +            inst.add([d])
   9.171 +            inst.commit('Add %r' % d, [d])
   9.172 +        inst.add(dirs[len(dirs)/2:] + names)
   9.173 +        inst.commit('Add remaining dirs and files')
   9.174 +    finally:
   9.175 +        print >> sys.stderr, '[cleaning up...]'
   9.176 +        shutil.rmtree(root)
   9.177 +        os.chdir(oldcwd)
   9.178 +
   9.179 +benchmark(mercurial)
   9.180 +#benchmark(subversion)

    10.1 --- a/en/00book.xml	Mon Apr 06 23:13:53 2009 -0700
    10.2 +++ b/en/00book.xml	Mon Apr 06 23:15:52 2009 -0700
    10.3 @@ -39,6 +39,11 @@
    10.4  
    10.5  <book id="hg">
    10.6    <title>Mercurial: The Definitive Guide</title>
    10.7 +  
    10.8 +  <!-- hg parents &#x2d;&#x2d;template '{node|short} ({date|shortdate})' 
    10.9 +  <subtitle>Compiled from 8a1d3f1aff17 (2009-03-10)</subtitle>
   10.10 +  -->
   10.11 +  <subtitle>Compiled from $rev_id$</subtitle>
   10.12    <bookinfo>
   10.13      <edition>1</edition>
   10.14      <isbn>9780596800673</isbn>
   10.15 @@ -91,8 +96,6 @@
   10.16    &ch12;
   10.17    <!-- BEGIN ch13 -->
   10.18    &ch13;
   10.19 -  <!-- BEGIN appA -->
   10.20 -  <!-- &appA; -->
   10.21    <!-- BEGIN appB -->
   10.22    &appB;
   10.23    <!-- BEGIN appC -->

    11.1 --- a/en/Makefile	Mon Apr 06 23:13:53 2009 -0700
    11.2 +++ b/en/Makefile	Mon Apr 06 23:15:52 2009 -0700
    11.3 @@ -112,18 +112,18 @@
    11.4  
    11.5  all: web complete.xml
    11.6  
    11.7 -../xsl/system-xsl: $(system-xsl-dir)
    11.8 +../stylesheets/system-xsl: $(system-xsl-dir)
    11.9  	ln -s $< $@
   11.10  
   11.11 -web: ../xsl/system-xsl websup html
   11.12 +web: ../stylesheets/system-xsl websup html
   11.13  
   11.14  html: $(obj-web-read)/index.html
   11.15  
   11.16  ../web/index-read.html.in: ../web/genindex.py $(xml-src-files)
   11.17  	cd ../web && ./genindex.py
   11.18  
   11.19 -$(obj-web-read)/index.html: ../xsl/system-xsl .validated-00book.xml ../web/index-read.html.in
   11.20 -	xsltproc $(xsltproc-opts) -o $(obj-web-read)/x ../xsl/chunk-stylesheet.xsl 00book.xml
   11.21 +$(obj-web-read)/index.html: ../stylesheets/system-xsl .validated-00book.xml ../web/index-read.html.in
   11.22 +	xsltproc $(xsltproc-opts) -o $(obj-web-read)/x ../stylesheets/chunk-stylesheet.xsl 00book.xml
   11.23  	python ../web/texpand.py ../web/index-read.html.in html/read/index.html
   11.24  	for i in $(obj-web-read)/*.html; do \
   11.25  	  gzip -9 -c $$i > $$i.gz; \
   11.26 @@ -131,14 +131,14 @@
   11.27  
   11.28  websup: $(extras-web) $(image-web)
   11.29  	mkdir -p $(obj-websup)/figs $(obj-web-read)/figs
   11.30 -	cp ../xsl/system-xsl/images/*.png $(obj-websup)/figs
   11.31 +	cp ../stylesheets/system-xsl/images/*.png $(obj-websup)/figs
   11.32  	cp -f ../web/icons/*.png $(obj-websup)/figs
   11.33  
   11.34  complete.xml: .validated-00book.xml
   11.35 -	$(xsltproc) $(xsltproc-opts) -o $@ ../xsl/dtd-profile.xsl 00book.xml
   11.36 -
   11.37 -all-ids.dat: ../xsl/all-ids.xsl $(xml-src-files)
   11.38 -	$(xsltproc) $(xsltproc-opts) -o $@ ../xsl/all-ids.xsl 00book.xml
   11.39 +	$(xsltproc) $(xsltproc-opts) -o $@ ../stylesheets/dtd-profile.xsl 00book.xml
   11.40 +
   11.41 +all-ids.dat: ../stylesheets/all-ids.xsl $(xml-src-files)
   11.42 +	$(xsltproc) $(xsltproc-opts) -o $@ ../stylesheets/all-ids.xsl 00book.xml
   11.43  
   11.44  web: websup
   11.45  

    12.1 --- a/en/appB-mq-ref.xml	Mon Apr 06 23:13:53 2009 -0700
    12.2 +++ b/en/appB-mq-ref.xml	Mon Apr 06 23:15:52 2009 -0700
    12.3 @@ -43,7 +43,7 @@
    12.4  	<title><command
    12.5  	  role="hg-ext-mq">qdelete</command>&emdash;delete a patch
    12.6  	from the <filename role="special">series</filename>
    12.7 -	file}</title>
    12.8 +	file</title>
    12.9  
   12.10        <para id="x_5ec">The <command role="hg-ext-mq">qdelete</command> command
   12.11  	removes the entry for a patch from the <filename

    13.1 --- a/en/ch02-tour-merge.xml	Mon Apr 06 23:13:53 2009 -0700
    13.2 +++ b/en/ch02-tour-merge.xml	Mon Apr 06 23:15:52 2009 -0700
    13.3 @@ -166,7 +166,7 @@
    13.4  
    13.5        <para>We sometimes talk about a merge having
    13.6  	<emphasis>sides</emphasis>: the left side is the first parent
    13.7 -	in the output of <command rold="hg-cmd">hg parents</command>,
    13.8 +	in the output of <command role="hg-cmd">hg parents</command>,
    13.9  	and the right side is the second.  If the working directory
   13.10  	was at e.g. revision 5 before we began a merge, that revision
   13.11  	will become the left side of the merge.</para>
   13.12 @@ -255,7 +255,7 @@
   13.13  	  file</title>
   13.14  	<mediaobject>
   13.15  	  <imageobject>
   13.16 -	    <imagedata fileref="figs/kdiff3.png"/></imageobject>
   13.17 +	    <imagedata width="100%" fileref="figs/kdiff3.png"/></imageobject>
   13.18  	  <textobject>
   13.19  	    <phrase>XXX add text</phrase>
   13.20  	  </textobject>

    14.1 --- a/en/ch05-collab.xml	Mon Apr 06 23:13:53 2009 -0700
    14.2 +++ b/en/ch05-collab.xml	Mon Apr 06 23:15:52 2009 -0700
    14.3 @@ -272,7 +272,7 @@
    14.4        <figure id="fig:collab:feature-branches">
    14.5  	<title>Feature branches</title>
    14.6  	<mediaobject>
    14.7 -	  <imageobject><imagedata fileref="figs/feature-branches.png"/></imageobject>
    14.8 +	  <imageobject><imagedata width="100%" fileref="figs/feature-branches.png"/></imageobject>
    14.9  	  <textobject><phrase>XXX add text</phrase></textobject>
   14.10  	</mediaobject>
   14.11        </figure>

    15.1 --- a/en/examples/results/backout.init.out	Mon Apr 06 23:13:53 2009 -0700
    15.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.3 @@ -1,10 +0,0 @@
    15.4 -<!-- BEGIN backout.init -->
    15.5 -<screen><prompt>$</prompt> <userinput>hg init myrepo</userinput>
    15.6 -<prompt>$</prompt> <userinput>cd myrepo</userinput>
    15.7 -<prompt>$</prompt> <userinput>echo first change &gt;&gt; myfile</userinput>
    15.8 -<prompt>$</prompt> <userinput>hg add myfile</userinput>
    15.9 -<prompt>$</prompt> <userinput>hg commit -m 'first change'</userinput>
   15.10 -<prompt>$</prompt> <userinput>echo second change &gt;&gt; myfile</userinput>
   15.11 -<prompt>$</prompt> <userinput>hg commit -m 'second change'</userinput>
   15.12 -</screen>
   15.13 -<!-- END backout.init -->

    16.1 --- a/en/examples/results/backout.manual.backout.out	Mon Apr 06 23:13:53 2009 -0700
    16.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.3 @@ -1,11 +0,0 @@
    16.4 -<!-- BEGIN backout.manual.backout -->
    16.5 -<screen><prompt>$</prompt> <userinput>echo third change &gt;&gt; myfile</userinput>
    16.6 -<prompt>$</prompt> <userinput>hg commit -m 'third change'</userinput>
    16.7 -<prompt>$</prompt> <userinput>hg backout -m 'back out second change' 1</userinput>
    16.8 -reverting myfile
    16.9 -created new head
   16.10 -changeset  backs out changeset 
   16.11 -the backout changeset is a new head - do not forget to merge
   16.12 -(use "backout --merge" if you want to auto-merge)
   16.13 -</screen>
   16.14 -<!-- END backout.manual.backout -->

    17.1 --- a/en/examples/results/backout.manual.cat.out	Mon Apr 06 23:13:53 2009 -0700
    17.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.3 @@ -1,7 +0,0 @@
    17.4 -<!-- BEGIN backout.manual.cat -->
    17.5 -<screen><prompt>$</prompt> <userinput>cat myfile</userinput>
    17.6 -first change
    17.7 -second change
    17.8 -third change
    17.9 -</screen>
   17.10 -<!-- END backout.manual.cat -->

    18.1 --- a/en/examples/results/backout.manual.clone.out	Mon Apr 06 23:13:53 2009 -0700
    18.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.3 @@ -1,13 +0,0 @@
    18.4 -<!-- BEGIN backout.manual.clone -->
    18.5 -<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    18.6 -<prompt>$</prompt> <userinput>hg clone -r1 myrepo newrepo</userinput>
    18.7 -requesting all changes
    18.8 -adding changesets
    18.9 -adding manifests
   18.10 -adding file changes
   18.11 -added 2 changesets with 2 changes to 1 files
   18.12 -updating working directory
   18.13 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   18.14 -<prompt>$</prompt> <userinput>cd newrepo</userinput>
   18.15 -</screen>
   18.16 -<!-- END backout.manual.clone -->

    19.1 --- a/en/examples/results/backout.manual.heads.out	Mon Apr 06 23:13:53 2009 -0700
    19.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.3 @@ -1,16 +0,0 @@
    19.4 -<!-- BEGIN backout.manual.heads -->
    19.5 -<screen><prompt>$</prompt> <userinput>hg heads</userinput>
    19.6 -changeset:   
    19.7 -tag:         tip
    19.8 -parent:      
    19.9 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   19.10 -
   19.11 -summary:     back out second change
   19.12 -
   19.13 -changeset:   
   19.14 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   19.15 -
   19.16 -summary:     third change
   19.17 -
   19.18 -</screen>
   19.19 -<!-- END backout.manual.heads -->

    20.1 --- a/en/examples/results/backout.manual.log.out	Mon Apr 06 23:13:53 2009 -0700
    20.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.3 @@ -1,16 +0,0 @@
    20.4 -<!-- BEGIN backout.manual.log -->
    20.5 -<screen><prompt>$</prompt> <userinput>hg log --style compact</userinput>
    20.6 -3[tip]:1      2009-03-31 19:08 +0000   bos
    20.7 -  back out second change
    20.8 -
    20.9 -2      2009-03-31 19:08 +0000   bos
   20.10 -  third change
   20.11 -
   20.12 -1      2009-03-31 19:08 +0000   bos
   20.13 -  second change
   20.14 -
   20.15 -0      2009-03-31 19:08 +0000   bos
   20.16 -  first change
   20.17 -
   20.18 -</screen>
   20.19 -<!-- END backout.manual.log -->

    21.1 --- a/en/examples/results/backout.manual.merge.out	Mon Apr 06 23:13:53 2009 -0700
    21.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.3 @@ -1,11 +0,0 @@
    21.4 -<!-- BEGIN backout.manual.merge -->
    21.5 -<screen><prompt>$</prompt> <userinput>hg merge</userinput>
    21.6 -merging myfile
    21.7 -0 files updated, 1 files merged, 0 files removed, 0 files unresolved
    21.8 -(branch merge, don't forget to commit)
    21.9 -<prompt>$</prompt> <userinput>hg commit -m 'merged backout with previous tip'</userinput>
   21.10 -<prompt>$</prompt> <userinput>cat myfile</userinput>
   21.11 -first change
   21.12 -third change
   21.13 -</screen>
   21.14 -<!-- END backout.manual.merge -->

    22.1 --- a/en/examples/results/backout.manual.parents.out	Mon Apr 06 23:13:53 2009 -0700
    22.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.3 @@ -1,9 +0,0 @@
    22.4 -<!-- BEGIN backout.manual.parents -->
    22.5 -<screen><prompt>$</prompt> <userinput>hg parents</userinput>
    22.6 -changeset:   
    22.7 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    22.8 -
    22.9 -summary:     third change
   22.10 -
   22.11 -</screen>
   22.12 -<!-- END backout.manual.parents -->

    23.1 --- a/en/examples/results/backout.non-tip.backout.out	Mon Apr 06 23:13:53 2009 -0700
    23.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.3 @@ -1,13 +0,0 @@
    23.4 -<!-- BEGIN backout.non-tip.backout -->
    23.5 -<screen><prompt>$</prompt> <userinput>echo third change &gt;&gt; myfile</userinput>
    23.6 -<prompt>$</prompt> <userinput>hg commit -m 'third change'</userinput>
    23.7 -<prompt>$</prompt> <userinput>hg backout --merge -m 'back out second change' 1</userinput>
    23.8 -reverting myfile
    23.9 -created new head
   23.10 -changeset  backs out changeset 
   23.11 -merging with changeset 
   23.12 -merging myfile
   23.13 -0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   23.14 -(branch merge, don't forget to commit)
   23.15 -</screen>
   23.16 -<!-- END backout.non-tip.backout -->

    24.1 --- a/en/examples/results/backout.non-tip.cat.out	Mon Apr 06 23:13:53 2009 -0700
    24.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.3 @@ -1,6 +0,0 @@
    24.4 -<!-- BEGIN backout.non-tip.cat -->
    24.5 -<screen><prompt>$</prompt> <userinput>cat myfile</userinput>
    24.6 -first change
    24.7 -third change
    24.8 -</screen>
    24.9 -<!-- END backout.non-tip.cat -->

    25.1 --- a/en/examples/results/backout.non-tip.clone.out	Mon Apr 06 23:13:53 2009 -0700
    25.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.3 @@ -1,13 +0,0 @@
    25.4 -<!-- BEGIN backout.non-tip.clone -->
    25.5 -<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    25.6 -<prompt>$</prompt> <userinput>hg clone -r1 myrepo non-tip-repo</userinput>
    25.7 -requesting all changes
    25.8 -adding changesets
    25.9 -adding manifests
   25.10 -adding file changes
   25.11 -added 2 changesets with 2 changes to 1 files
   25.12 -updating working directory
   25.13 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   25.14 -<prompt>$</prompt> <userinput>cd non-tip-repo</userinput>
   25.15 -</screen>
   25.16 -<!-- END backout.non-tip.clone -->

    26.1 --- a/en/examples/results/backout.simple.log.out	Mon Apr 06 23:13:53 2009 -0700
    26.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.3 @@ -1,13 +0,0 @@
    26.4 -<!-- BEGIN backout.simple.log -->
    26.5 -<screen><prompt>$</prompt> <userinput>hg log --style compact</userinput>
    26.6 -2[tip]      2009-03-31 19:08 +0000   bos
    26.7 -  back out second change
    26.8 -
    26.9 -1      2009-03-31 19:08 +0000   bos
   26.10 -  second change
   26.11 -
   26.12 -0      2009-03-31 19:08 +0000   bos
   26.13 -  first change
   26.14 -
   26.15 -</screen>
   26.16 -<!-- END backout.simple.log -->

    27.1 --- a/en/examples/results/backout.simple.out	Mon Apr 06 23:13:53 2009 -0700
    27.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.3 @@ -1,8 +0,0 @@
    27.4 -<!-- BEGIN backout.simple -->
    27.5 -<screen><prompt>$</prompt> <userinput>hg backout -m 'back out second change' tip</userinput>
    27.6 -reverting myfile
    27.7 -changeset  backs out changeset 
    27.8 -<prompt>$</prompt> <userinput>cat myfile</userinput>
    27.9 -first change
   27.10 -</screen>
   27.11 -<!-- END backout.simple -->

    28.1 --- a/en/examples/results/bisect.commits.out	Mon Apr 06 23:13:53 2009 -0700
    28.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.3 @@ -1,13 +0,0 @@
    28.4 -
    28.5 -
    28.6 -
    28.7 -
    28.8 -
    28.9 -
   28.10 -
   28.11 -
   28.12 -
   28.13 -
   28.14 -
   28.15 -
   28.16 -

    29.1 --- a/en/examples/results/bisect.help.out	Mon Apr 06 23:13:53 2009 -0700
    29.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.3 @@ -1,36 +0,0 @@
    29.4 -
    29.5 -
    29.6 -
    29.7 -
    29.8 -
    29.9 -
   29.10 -
   29.11 -
   29.12 -
   29.13 -
   29.14 -
   29.15 -
   29.16 -
   29.17 -
   29.18 -
   29.19 -
   29.20 -
   29.21 -
   29.22 -
   29.23 -
   29.24 -
   29.25 -
   29.26 -
   29.27 -
   29.28 -
   29.29 -
   29.30 -
   29.31 -
   29.32 -
   29.33 -
   29.34 -
   29.35 -
   29.36 -
   29.37 -
   29.38 -
   29.39 -

    30.1 --- a/en/examples/results/bisect.init.out	Mon Apr 06 23:13:53 2009 -0700
    30.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    30.3 @@ -1,5 +0,0 @@
    30.4 -
    30.5 -
    30.6 -
    30.7 -
    30.8 -

    31.1 --- a/en/examples/results/bisect.search.bad-init.out	Mon Apr 06 23:13:53 2009 -0700
    31.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    31.3 @@ -1,5 +0,0 @@
    31.4 -
    31.5 -
    31.6 -
    31.7 -
    31.8 -

    32.1 --- a/en/examples/results/bisect.search.good-init.out	Mon Apr 06 23:13:53 2009 -0700
    32.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    32.3 @@ -1,7 +0,0 @@
    32.4 -
    32.5 -
    32.6 -
    32.7 -
    32.8 -
    32.9 -
   32.10 -

    33.1 --- a/en/examples/results/bisect.search.init.out	Mon Apr 06 23:13:53 2009 -0700
    33.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    33.3 @@ -1,5 +0,0 @@
    33.4 -
    33.5 -
    33.6 -
    33.7 -
    33.8 -

    34.1 --- a/en/examples/results/bisect.search.mytest.out	Mon Apr 06 23:13:53 2009 -0700
    34.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    34.3 @@ -1,13 +0,0 @@
    34.4 -
    34.5 -
    34.6 -
    34.7 -
    34.8 -
    34.9 -
   34.10 -
   34.11 -
   34.12 -
   34.13 -
   34.14 -
   34.15 -
   34.16 -

    35.1 --- a/en/examples/results/bisect.search.reset.out	Mon Apr 06 23:13:53 2009 -0700
    35.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    35.3 @@ -1,5 +0,0 @@
    35.4 -
    35.5 -
    35.6 -
    35.7 -
    35.8 -

    36.1 --- a/en/examples/results/bisect.search.rest.out	Mon Apr 06 23:13:53 2009 -0700
    36.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    36.3 @@ -1,22 +0,0 @@
    36.4 -
    36.5 -
    36.6 -
    36.7 -
    36.8 -
    36.9 -
   36.10 -
   36.11 -
   36.12 -
   36.13 -
   36.14 -
   36.15 -
   36.16 -
   36.17 -
   36.18 -
   36.19 -
   36.20 -
   36.21 -
   36.22 -
   36.23 -
   36.24 -
   36.25 -

    37.1 --- a/en/examples/results/bisect.search.step1.out	Mon Apr 06 23:13:53 2009 -0700
    37.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    37.3 @@ -1,14 +0,0 @@
    37.4 -
    37.5 -
    37.6 -
    37.7 -
    37.8 -
    37.9 -
   37.10 -
   37.11 -
   37.12 -
   37.13 -
   37.14 -
   37.15 -
   37.16 -
   37.17 -

    38.1 --- a/en/examples/results/bisect.search.step2.out	Mon Apr 06 23:13:53 2009 -0700
    38.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    38.3 @@ -1,8 +0,0 @@
    38.4 -
    38.5 -
    38.6 -
    38.7 -
    38.8 -
    38.9 -
   38.10 -
   38.11 -

    39.1 --- a/en/examples/results/branch-named.branch.out	Mon Apr 06 23:13:53 2009 -0700
    39.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    39.3 @@ -1,5 +0,0 @@
    39.4 -<!-- BEGIN branch-named.branch -->
    39.5 -<screen><prompt>$</prompt> <userinput>hg branch</userinput>
    39.6 -default
    39.7 -</screen>
    39.8 -<!-- END branch-named.branch -->

    40.1 --- a/en/examples/results/branch-named.branches.out	Mon Apr 06 23:13:53 2009 -0700
    40.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    40.3 @@ -1,12 +0,0 @@
    40.4 -<!-- BEGIN branch-named.branches -->
    40.5 -<screen><prompt>$</prompt> <userinput>hg tip</userinput>
    40.6 -changeset:   
    40.7 -tag:         tip
    40.8 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    40.9 -
   40.10 -summary:     Initial commit
   40.11 -
   40.12 -<prompt>$</prompt> <userinput>hg branches</userinput>
   40.13 -default                        
   40.14 -</screen>
   40.15 -<!-- END branch-named.branches -->

    41.1 --- a/en/examples/results/branch-named.commit.out	Mon Apr 06 23:13:53 2009 -0700
    41.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    41.3 @@ -1,13 +0,0 @@
    41.4 -<!-- BEGIN branch-named.commit -->
    41.5 -<screen><prompt>$</prompt> <userinput>echo 'hello again' &gt;&gt; myfile</userinput>
    41.6 -<prompt>$</prompt> <userinput>hg commit -m 'Second commit'</userinput>
    41.7 -<prompt>$</prompt> <userinput>hg tip</userinput>
    41.8 -changeset:   
    41.9 -branch:      foo
   41.10 -tag:         tip
   41.11 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   41.12 -
   41.13 -summary:     Second commit
   41.14 -
   41.15 -</screen>
   41.16 -<!-- END branch-named.commit -->

    42.1 --- a/en/examples/results/branch-named.create.out	Mon Apr 06 23:13:53 2009 -0700
    42.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    42.3 @@ -1,7 +0,0 @@
    42.4 -<!-- BEGIN branch-named.create -->
    42.5 -<screen><prompt>$</prompt> <userinput>hg branch foo</userinput>
    42.6 -marked working directory as branch foo
    42.7 -<prompt>$</prompt> <userinput>hg branch</userinput>
    42.8 -foo
    42.9 -</screen>
   42.10 -<!-- END branch-named.create -->

    43.1 --- a/en/examples/results/branch-named.foo-commit.out	Mon Apr 06 23:13:53 2009 -0700
    43.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    43.3 @@ -1,22 +0,0 @@
    43.4 -<!-- BEGIN branch-named.foo-commit -->
    43.5 -<screen><prompt>$</prompt> <userinput>echo something &gt; somefile</userinput>
    43.6 -<prompt>$</prompt> <userinput>hg commit -A -m 'New file'</userinput>
    43.7 -adding somefile
    43.8 -created new head
    43.9 -<prompt>$</prompt> <userinput>hg heads</userinput>
   43.10 -changeset:   
   43.11 -branch:      foo
   43.12 -tag:         tip
   43.13 -parent:      
   43.14 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   43.15 -
   43.16 -summary:     New file
   43.17 -
   43.18 -changeset:   
   43.19 -branch:      bar
   43.20 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   43.21 -
   43.22 -summary:     Third commit
   43.23 -
   43.24 -</screen>
   43.25 -<!-- END branch-named.foo-commit -->

    44.1 --- a/en/examples/results/branch-named.merge.out	Mon Apr 06 23:13:53 2009 -0700
    44.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    44.3 @@ -1,19 +0,0 @@
    44.4 -<!-- BEGIN branch-named.merge -->
    44.5 -<screen><prompt>$</prompt> <userinput>hg branch</userinput>
    44.6 -bar
    44.7 -<prompt>$</prompt> <userinput>hg merge foo</userinput>
    44.8 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    44.9 -(branch merge, don't forget to commit)
   44.10 -<prompt>$</prompt> <userinput>hg commit -m 'Merge'</userinput>
   44.11 -<prompt>$</prompt> <userinput>hg tip</userinput>
   44.12 -changeset:   
   44.13 -branch:      bar
   44.14 -tag:         tip
   44.15 -parent:      
   44.16 -parent:      
   44.17 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   44.18 -
   44.19 -summary:     Merge
   44.20 -
   44.21 -</screen>
   44.22 -<!-- END branch-named.merge -->

    45.1 --- a/en/examples/results/branch-named.parents.out	Mon Apr 06 23:13:53 2009 -0700
    45.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    45.3 @@ -1,15 +0,0 @@
    45.4 -<!-- BEGIN branch-named.parents -->
    45.5 -<screen><prompt>$</prompt> <userinput>hg parents</userinput>
    45.6 -changeset:   
    45.7 -branch:      bar
    45.8 -tag:         tip
    45.9 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   45.10 -
   45.11 -summary:     Third commit
   45.12 -
   45.13 -<prompt>$</prompt> <userinput>hg branches</userinput>
   45.14 -bar                            
   45.15 -foo                             (inactive)
   45.16 -default                         (inactive)
   45.17 -</screen>
   45.18 -<!-- END branch-named.parents -->

    46.1 --- a/en/examples/results/branch-named.rebranch.out	Mon Apr 06 23:13:53 2009 -0700
    46.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    46.3 @@ -1,18 +0,0 @@
    46.4 -<!-- BEGIN branch-named.rebranch -->
    46.5 -<screen><prompt>$</prompt> <userinput>hg branch</userinput>
    46.6 -foo
    46.7 -<prompt>$</prompt> <userinput>hg branch bar</userinput>
    46.8 -marked working directory as branch bar
    46.9 -<prompt>$</prompt> <userinput>echo new file &gt; newfile</userinput>
   46.10 -<prompt>$</prompt> <userinput>hg commit -A -m 'Third commit'</userinput>
   46.11 -adding newfile
   46.12 -<prompt>$</prompt> <userinput>hg tip</userinput>
   46.13 -changeset:   
   46.14 -branch:      bar
   46.15 -tag:         tip
   46.16 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   46.17 -
   46.18 -summary:     Third commit
   46.19 -
   46.20 -</screen>
   46.21 -<!-- END branch-named.rebranch -->

    47.1 --- a/en/examples/results/branch-named.status.out	Mon Apr 06 23:13:53 2009 -0700
    47.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    47.3 @@ -1,11 +0,0 @@
    47.4 -<!-- BEGIN branch-named.status -->
    47.5 -<screen><prompt>$</prompt> <userinput>hg status</userinput>
    47.6 -<prompt>$</prompt> <userinput>hg tip</userinput>
    47.7 -changeset:   
    47.8 -tag:         tip
    47.9 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   47.10 -
   47.11 -summary:     Initial commit
   47.12 -
   47.13 -</screen>
   47.14 -<!-- END branch-named.status -->

    48.1 --- a/en/examples/results/branch-named.update-bar.out	Mon Apr 06 23:13:53 2009 -0700
    48.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    48.3 @@ -1,5 +0,0 @@
    48.4 -<!-- BEGIN branch-named.update-bar -->
    48.5 -<screen><prompt>$</prompt> <userinput>hg update bar</userinput>
    48.6 -1 files updated, 0 files merged, 1 files removed, 0 files unresolved
    48.7 -</screen>
    48.8 -<!-- END branch-named.update-bar -->

    49.1 --- a/en/examples/results/branch-named.update-foo.out	Mon Apr 06 23:13:53 2009 -0700
    49.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    49.3 @@ -1,13 +0,0 @@
    49.4 -$ \textbf{hg update foo}
    49.5 -0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    49.6 -$ \textbf{hg update}
    49.7 -0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    49.8 -$ \textbf{hg parents}
    49.9 -changeset:   
   49.10 -branch:      foo
   49.11 -user:        Bryan O'Sullivan <bos@serpentine.com>
   49.12 -
   49.13 -summary:     Second commit
   49.14 -
   49.15 -$ \textbf{hg update bar}
   49.16 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    50.1 --- a/en/examples/results/branch-named.update-nothing.out	Mon Apr 06 23:13:53 2009 -0700
    50.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    50.3 @@ -1,7 +0,0 @@
    50.4 -<!-- BEGIN branch-named.update-nothing -->
    50.5 -<screen><prompt>$</prompt> <userinput>hg update foo</userinput>
    50.6 -0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    50.7 -<prompt>$</prompt> <userinput>hg update</userinput>
    50.8 -0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    50.9 -</screen>
   50.10 -<!-- END branch-named.update-nothing -->

    51.1 --- a/en/examples/results/branch-named.update-switchy.out	Mon Apr 06 23:13:53 2009 -0700
    51.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    51.3 @@ -1,22 +0,0 @@
    51.4 -<!-- BEGIN branch-named.update-switchy -->
    51.5 -<screen><prompt>$</prompt> <userinput>hg update foo</userinput>
    51.6 -0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    51.7 -<prompt>$</prompt> <userinput>hg parents</userinput>
    51.8 -changeset:   
    51.9 -branch:      foo
   51.10 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   51.11 -
   51.12 -summary:     Second commit
   51.13 -
   51.14 -<prompt>$</prompt> <userinput>hg update bar</userinput>
   51.15 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   51.16 -<prompt>$</prompt> <userinput>hg parents</userinput>
   51.17 -changeset:   
   51.18 -branch:      bar
   51.19 -tag:         tip
   51.20 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   51.21 -
   51.22 -summary:     Third commit
   51.23 -
   51.24 -</screen>
   51.25 -<!-- END branch-named.update-switchy -->

    52.1 --- a/en/examples/results/branch-named.update.out	Mon Apr 06 23:13:53 2009 -0700
    52.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    52.3 @@ -1,13 +0,0 @@
    52.4 -$ \textbf{hg update foo}
    52.5 -0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    52.6 -$ \textbf{hg update}
    52.7 -0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    52.8 -$ \textbf{hg parent}
    52.9 -changeset:   
   52.10 -branch:      foo
   52.11 -user:        Bryan O'Sullivan <bos@serpentine.com>
   52.12 -
   52.13 -summary:     Second commit
   52.14 -
   52.15 -$ \textbf{hg update bar}
   52.16 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    53.1 --- a/en/examples/results/branch-repo.bugfix.out	Mon Apr 06 23:13:53 2009 -0700
    53.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    53.3 @@ -1,16 +0,0 @@
    53.4 -<!-- BEGIN branch-repo.bugfix -->
    53.5 -<screen><prompt>$</prompt> <userinput>hg clone myproject-1.0.1 my-1.0.1-bugfix</userinput>
    53.6 -updating working directory
    53.7 -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
    53.8 -<prompt>$</prompt> <userinput>cd my-1.0.1-bugfix</userinput>
    53.9 -<prompt>$</prompt> <userinput>echo 'I fixed a bug using only echo!' &gt;&gt; myfile</userinput>
   53.10 -<prompt>$</prompt> <userinput>hg commit -m 'Important fix for 1.0.1'</userinput>
   53.11 -<prompt>$</prompt> <userinput>hg push</userinput>
   53.12 -pushing to 
   53.13 -searching for changes
   53.14 -adding changesets
   53.15 -adding manifests
   53.16 -adding file changes
   53.17 -added 1 changesets with 1 changes to 1 files
   53.18 -</screen>
   53.19 -<!-- END branch-repo.bugfix -->

    54.1 --- a/en/examples/results/branch-repo.clone.out	Mon Apr 06 23:13:53 2009 -0700
    54.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    54.3 @@ -1,7 +0,0 @@
    54.4 -<!-- BEGIN branch-repo.clone -->
    54.5 -<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    54.6 -<prompt>$</prompt> <userinput>hg clone myproject myproject-1.0.1</userinput>
    54.7 -updating working directory
    54.8 -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
    54.9 -</screen>
   54.10 -<!-- END branch-repo.clone -->

    55.1 --- a/en/examples/results/branch-repo.merge.out	Mon Apr 06 23:13:53 2009 -0700
    55.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    55.3 @@ -1,14 +0,0 @@
    55.4 -<!-- BEGIN branch-repo.merge -->
    55.5 -<screen><prompt>$</prompt> <userinput>hg merge</userinput>
    55.6 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    55.7 -(branch merge, don't forget to commit)
    55.8 -<prompt>$</prompt> <userinput>hg commit -m 'Merge bugfix from 1.0.1 branch'</userinput>
    55.9 -<prompt>$</prompt> <userinput>hg push</userinput>
   55.10 -pushing to 
   55.11 -searching for changes
   55.12 -adding changesets
   55.13 -adding manifests
   55.14 -adding file changes
   55.15 -added 2 changesets with 1 changes to 1 files
   55.16 -</screen>
   55.17 -<!-- END branch-repo.merge -->

    56.1 --- a/en/examples/results/branch-repo.new.out	Mon Apr 06 23:13:53 2009 -0700
    56.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    56.3 @@ -1,18 +0,0 @@
    56.4 -<!-- BEGIN branch-repo.new -->
    56.5 -<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    56.6 -<prompt>$</prompt> <userinput>hg clone myproject my-feature</userinput>
    56.7 -updating working directory
    56.8 -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
    56.9 -<prompt>$</prompt> <userinput>cd my-feature</userinput>
   56.10 -<prompt>$</prompt> <userinput>echo 'This sure is an exciting new feature!' &gt; mynewfile</userinput>
   56.11 -<prompt>$</prompt> <userinput>hg commit -A -m 'New feature'</userinput>
   56.12 -adding mynewfile
   56.13 -<prompt>$</prompt> <userinput>hg push</userinput>
   56.14 -pushing to 
   56.15 -searching for changes
   56.16 -adding changesets
   56.17 -adding manifests
   56.18 -adding file changes
   56.19 -added 1 changesets with 1 changes to 1 files
   56.20 -</screen>
   56.21 -<!-- END branch-repo.new -->

    57.1 --- a/en/examples/results/branch-repo.pull.out	Mon Apr 06 23:13:53 2009 -0700
    57.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    57.3 @@ -1,16 +0,0 @@
    57.4 -<!-- BEGIN branch-repo.pull -->
    57.5 -<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    57.6 -<prompt>$</prompt> <userinput>hg clone myproject myproject-merge</userinput>
    57.7 -updating working directory
    57.8 -3 files updated, 0 files merged, 0 files removed, 0 files unresolved
    57.9 -<prompt>$</prompt> <userinput>cd myproject-merge</userinput>
   57.10 -<prompt>$</prompt> <userinput>hg pull ../myproject-1.0.1</userinput>
   57.11 -pulling from ../myproject-1.0.1
   57.12 -searching for changes
   57.13 -adding changesets
   57.14 -adding manifests
   57.15 -adding file changes
   57.16 -added 1 changesets with 1 changes to 1 files (+1 heads)
   57.17 -(run 'hg heads' to see heads, 'hg merge' to merge)
   57.18 -</screen>
   57.19 -<!-- END branch-repo.pull -->

    58.1 --- a/en/examples/results/branch-repo.tag.out	Mon Apr 06 23:13:53 2009 -0700
    58.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    58.3 @@ -1,5 +0,0 @@
    58.4 -<!-- BEGIN branch-repo.tag -->
    58.5 -<screen><prompt>$</prompt> <userinput>cd myproject</userinput>
    58.6 -<prompt>$</prompt> <userinput>hg tag v1.0</userinput>
    58.7 -</screen>
    58.8 -<!-- END branch-repo.tag -->

    59.1 --- a/en/examples/results/branching.clone.out	Mon Apr 06 23:13:53 2009 -0700
    59.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    59.3 @@ -1,12 +0,0 @@
    59.4 -<!-- BEGIN branching.clone -->
    59.5 -<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    59.6 -<prompt>$</prompt> <userinput>hg clone -rv1.0 main stable</userinput>
    59.7 -requesting all changes
    59.8 -adding changesets
    59.9 -adding manifests
   59.10 -adding file changes
   59.11 -added 1 changesets with 1 changes to 1 files
   59.12 -updating working directory
   59.13 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   59.14 -</screen>
   59.15 -<!-- END branching.clone -->

    60.1 --- a/en/examples/results/branching.init.out	Mon Apr 06 23:13:53 2009 -0700
    60.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    60.3 @@ -1,8 +0,0 @@
    60.4 -<!-- BEGIN branching.init -->
    60.5 -<screen><prompt>$</prompt> <userinput>hg init main</userinput>
    60.6 -<prompt>$</prompt> <userinput>cd main</userinput>
    60.7 -<prompt>$</prompt> <userinput>echo 'This is a boring feature.' &gt; myfile</userinput>
    60.8 -<prompt>$</prompt> <userinput>hg commit -A -m 'We have reached an important milestone!'</userinput>
    60.9 -adding myfile
   60.10 -</screen>
   60.11 -<!-- END branching.init -->

    61.1 --- a/en/examples/results/branching.main.out	Mon Apr 06 23:13:53 2009 -0700
    61.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    61.3 @@ -1,9 +0,0 @@
    61.4 -<!-- BEGIN branching.main -->
    61.5 -<screen><prompt>$</prompt> <userinput>cd ../main</userinput>
    61.6 -<prompt>$</prompt> <userinput>echo 'This is exciting and new!' &gt;&gt; myfile</userinput>
    61.7 -<prompt>$</prompt> <userinput>hg commit -m 'Add a new feature'</userinput>
    61.8 -<prompt>$</prompt> <userinput>cat myfile</userinput>
    61.9 -This is a boring feature.
   61.10 -This is exciting and new!
   61.11 -</screen>
   61.12 -<!-- END branching.main -->

    62.1 --- a/en/examples/results/branching.merge.out	Mon Apr 06 23:13:53 2009 -0700
    62.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    62.3 @@ -1,20 +0,0 @@
    62.4 -<!-- BEGIN branching.merge -->
    62.5 -<screen><prompt>$</prompt> <userinput>cd ../main</userinput>
    62.6 -<prompt>$</prompt> <userinput>hg pull ../stable</userinput>
    62.7 -pulling from ../stable
    62.8 -searching for changes
    62.9 -adding changesets
   62.10 -adding manifests
   62.11 -adding file changes
   62.12 -added 1 changesets with 1 changes to 1 files (+1 heads)
   62.13 -(run 'hg heads' to see heads, 'hg merge' to merge)
   62.14 -<prompt>$</prompt> <userinput>hg merge</userinput>
   62.15 -merging myfile
   62.16 -0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   62.17 -(branch merge, don't forget to commit)
   62.18 -<prompt>$</prompt> <userinput>hg commit -m 'Bring in bugfix from stable branch'</userinput>
   62.19 -<prompt>$</prompt> <userinput>cat myfile</userinput>
   62.20 -This is a fix to a boring feature.
   62.21 -This is exciting and new!
   62.22 -</screen>
   62.23 -<!-- END branching.merge -->

    63.1 --- a/en/examples/results/branching.stable.out	Mon Apr 06 23:13:53 2009 -0700
    63.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    63.3 @@ -1,16 +0,0 @@
    63.4 -<!-- BEGIN branching.stable -->
    63.5 -<screen><prompt>$</prompt> <userinput>hg clone stable stable-fix</userinput>
    63.6 -updating working directory
    63.7 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    63.8 -<prompt>$</prompt> <userinput>cd stable-fix</userinput>
    63.9 -<prompt>$</prompt> <userinput>echo 'This is a fix to a boring feature.' &gt; myfile</userinput>
   63.10 -<prompt>$</prompt> <userinput>hg commit -m 'Fix a bug'</userinput>
   63.11 -<prompt>$</prompt> <userinput>hg push</userinput>
   63.12 -pushing to 
   63.13 -searching for changes
   63.14 -adding changesets
   63.15 -adding manifests
   63.16 -adding file changes
   63.17 -added 1 changesets with 1 changes to 1 files
   63.18 -</screen>
   63.19 -<!-- END branching.stable -->

    64.1 --- a/en/examples/results/branching.tag.out	Mon Apr 06 23:13:53 2009 -0700
    64.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    64.3 @@ -1,14 +0,0 @@
    64.4 -<!-- BEGIN branching.tag -->
    64.5 -<screen><prompt>$</prompt> <userinput>hg tag v1.0</userinput>
    64.6 -<prompt>$</prompt> <userinput>hg tip</userinput>
    64.7 -changeset:   
    64.8 -tag:         tip
    64.9 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   64.10 -
   64.11 -summary:     Added tag v1.0 for changeset 
   64.12 -
   64.13 -<prompt>$</prompt> <userinput>hg tags</userinput>
   64.14 -tip                                
   64.15 -v1.0                               
   64.16 -</screen>
   64.17 -<!-- END branching.tag -->

    65.1 --- a/en/examples/results/branching.update.out	Mon Apr 06 23:13:53 2009 -0700
    65.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    65.3 @@ -1,10 +0,0 @@
    65.4 -<!-- BEGIN branching.update -->
    65.5 -<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    65.6 -<prompt>$</prompt> <userinput>hg clone -U main main-old</userinput>
    65.7 -<prompt>$</prompt> <userinput>cd main-old</userinput>
    65.8 -<prompt>$</prompt> <userinput>hg update v1.0</userinput>
    65.9 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   65.10 -<prompt>$</prompt> <userinput>cat myfile</userinput>
   65.11 -This is a boring feature.
   65.12 -</screen>
   65.13 -<!-- END branching.update -->

    66.1 --- a/en/examples/results/cmdref.diff-p.out	Mon Apr 06 23:13:53 2009 -0700
    66.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    66.3 @@ -1,25 +0,0 @@
    66.4 -<!-- BEGIN cmdref.diff-p -->
    66.5 -<screen><prompt>$</prompt> <userinput>echo '[diff]' &gt;&gt; $HGRC</userinput>
    66.6 -<prompt>$</prompt> <userinput>echo 'showfunc = False' &gt;&gt; $HGRC</userinput>
    66.7 -<prompt>$</prompt> <userinput>hg diff</userinput>
    66.8 -diff -r  myfile.c
    66.9 -
   66.10 -
   66.11 -@@ -1,4 +1,4 @@
   66.12 - int myfunc()
   66.13 - {
   66.14 --    return 1;
   66.15 -+    return 10;
   66.16 - }
   66.17 -<prompt>$</prompt> <userinput>hg diff -p</userinput>
   66.18 -diff -r  myfile.c
   66.19 -
   66.20 -
   66.21 -@@ -1,4 +1,4 @@
   66.22 - int myfunc()
   66.23 - {
   66.24 --    return 1;
   66.25 -+    return 10;
   66.26 - }
   66.27 -</screen>
   66.28 -<!-- END cmdref.diff-p -->

    67.1 --- a/en/examples/results/daily.copy.after.out	Mon Apr 06 23:13:53 2009 -0700
    67.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    67.3 @@ -1,5 +0,0 @@
    67.4 -<!-- BEGIN daily.copy.after -->
    67.5 -<screen><prompt>$</prompt> <userinput>cp a z</userinput>
    67.6 -<prompt>$</prompt> <userinput>hg copy --after a z</userinput>
    67.7 -</screen>
    67.8 -<!-- END daily.copy.after -->

    68.1 --- a/en/examples/results/daily.copy.cat.out	Mon Apr 06 23:13:53 2009 -0700
    68.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    68.3 @@ -1,8 +0,0 @@
    68.4 -<!-- BEGIN daily.copy.cat -->
    68.5 -<screen><prompt>$</prompt> <userinput>cat file</userinput>
    68.6 -line
    68.7 -new contents
    68.8 -<prompt>$</prompt> <userinput>cat ../my-copy/new-file</userinput>
    68.9 -line
   68.10 -</screen>
   68.11 -<!-- END daily.copy.cat -->

    69.1 --- a/en/examples/results/daily.copy.clone.out	Mon Apr 06 23:13:53 2009 -0700
    69.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    69.3 @@ -1,7 +0,0 @@
    69.4 -<!-- BEGIN daily.copy.clone -->
    69.5 -<screen><prompt>$</prompt> <userinput>cd ..</userinput>
    69.6 -<prompt>$</prompt> <userinput>hg clone my-copy your-copy</userinput>
    69.7 -updating working directory
    69.8 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    69.9 -</screen>
   69.10 -<!-- END daily.copy.clone -->

    70.1 --- a/en/examples/results/daily.copy.copy.out	Mon Apr 06 23:13:53 2009 -0700
    70.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    70.3 @@ -1,5 +0,0 @@
    70.4 -<!-- BEGIN daily.copy.copy -->
    70.5 -<screen><prompt>$</prompt> <userinput>cd my-copy</userinput>
    70.6 -<prompt>$</prompt> <userinput>hg copy file new-file</userinput>
    70.7 -</screen>
    70.8 -<!-- END daily.copy.copy -->

    71.1 --- a/en/examples/results/daily.copy.dir-dest.out	Mon Apr 06 23:13:53 2009 -0700
    71.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    71.3 @@ -1,7 +0,0 @@
    71.4 -<!-- BEGIN daily.copy.dir-dest -->
    71.5 -<screen><prompt>$</prompt> <userinput>mkdir d</userinput>
    71.6 -<prompt>$</prompt> <userinput>hg copy a b d</userinput>
    71.7 -<prompt>$</prompt> <userinput>ls d</userinput>
    71.8 -a  b
    71.9 -</screen>
   71.10 -<!-- END daily.copy.dir-dest -->

    72.1 --- a/en/examples/results/daily.copy.dir-src-dest.out	Mon Apr 06 23:13:53 2009 -0700
    72.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    72.3 @@ -1,5 +0,0 @@
    72.4 -<!-- BEGIN daily.copy.dir-src-dest -->
    72.5 -<screen><prompt>$</prompt> <userinput>hg copy c d</userinput>
    72.6 -copying c/a/c to d/c/a/c
    72.7 -</screen>
    72.8 -<!-- END daily.copy.dir-src-dest -->

    73.1 --- a/en/examples/results/daily.copy.dir-src.out	Mon Apr 06 23:13:53 2009 -0700
    73.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    73.3 @@ -1,5 +0,0 @@
    73.4 -<!-- BEGIN daily.copy.dir-src -->
    73.5 -<screen><prompt>$</prompt> <userinput>hg copy c e</userinput>
    73.6 -copying c/a/c to e/a/c
    73.7 -</screen>
    73.8 -<!-- END daily.copy.dir-src -->

    74.1 --- a/en/examples/results/daily.copy.init.out	Mon Apr 06 23:13:53 2009 -0700
    74.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    74.3 @@ -1,8 +0,0 @@
    74.4 -<!-- BEGIN daily.copy.init -->
    74.5 -<screen><prompt>$</prompt> <userinput>hg init my-copy</userinput>
    74.6 -<prompt>$</prompt> <userinput>cd my-copy</userinput>
    74.7 -<prompt>$</prompt> <userinput>echo line &gt; file</userinput>
    74.8 -<prompt>$</prompt> <userinput>hg add file</userinput>
    74.9 -<prompt>$</prompt> <userinput>hg commit -m 'Added a file'</userinput>
   74.10 -</screen>
   74.11 -<!-- END daily.copy.init -->

    75.1 --- a/en/examples/results/daily.copy.merge.out	Mon Apr 06 23:13:53 2009 -0700
    75.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    75.3 @@ -1,18 +0,0 @@
    75.4 -<!-- BEGIN daily.copy.merge -->
    75.5 -<screen><prompt>$</prompt> <userinput>hg pull ../my-copy</userinput>
    75.6 -pulling from ../my-copy
    75.7 -searching for changes
    75.8 -adding changesets
    75.9 -adding manifests
   75.10 -adding file changes
   75.11 -added 1 changesets with 1 changes to 1 files (+1 heads)
   75.12 -(run 'hg heads' to see heads, 'hg merge' to merge)
   75.13 -<prompt>$</prompt> <userinput>hg merge</userinput>
   75.14 -merging file and new-file to new-file
   75.15 -0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   75.16 -(branch merge, don't forget to commit)
   75.17 -<prompt>$</prompt> <userinput>cat new-file</userinput>
   75.18 -line
   75.19 -new contents
   75.20 -</screen>
   75.21 -<!-- END daily.copy.merge -->

    76.1 --- a/en/examples/results/daily.copy.other.out	Mon Apr 06 23:13:53 2009 -0700
    76.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    76.3 @@ -1,6 +0,0 @@
    76.4 -<!-- BEGIN daily.copy.other -->
    76.5 -<screen><prompt>$</prompt> <userinput>cd ../your-copy</userinput>
    76.6 -<prompt>$</prompt> <userinput>echo 'new contents' &gt;&gt; file</userinput>
    76.7 -<prompt>$</prompt> <userinput>hg commit -m 'Changed file'</userinput>
    76.8 -</screen>
    76.9 -<!-- END daily.copy.other -->

    77.1 --- a/en/examples/results/daily.copy.simple.out	Mon Apr 06 23:13:53 2009 -0700
    77.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    77.3 @@ -1,7 +0,0 @@
    77.4 -<!-- BEGIN daily.copy.simple -->
    77.5 -<screen><prompt>$</prompt> <userinput>mkdir k</userinput>
    77.6 -<prompt>$</prompt> <userinput>hg copy a k</userinput>
    77.7 -<prompt>$</prompt> <userinput>ls k</userinput>
    77.8 -a
    77.9 -</screen>
   77.10 -<!-- END daily.copy.simple -->

    78.1 --- a/en/examples/results/daily.copy.status-copy.out	Mon Apr 06 23:13:53 2009 -0700
    78.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    78.3 @@ -1,7 +0,0 @@
    78.4 -<!-- BEGIN daily.copy.status-copy -->
    78.5 -<screen><prompt>$</prompt> <userinput>hg status -C</userinput>
    78.6 -A new-file
    78.7 -  file
    78.8 -<prompt>$</prompt> <userinput>hg commit -m 'Copied file'</userinput>
    78.9 -</screen>
   78.10 -<!-- END daily.copy.status-copy -->

    79.1 --- a/en/examples/results/daily.copy.status.out	Mon Apr 06 23:13:53 2009 -0700
    79.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    79.3 @@ -1,5 +0,0 @@
    79.4 -<!-- BEGIN daily.copy.status -->
    79.5 -<screen><prompt>$</prompt> <userinput>hg status</userinput>
    79.6 -A new-file
    79.7 -</screen>
    79.8 -<!-- END daily.copy.status -->

    80.1 --- a/en/examples/results/daily.files.add-dir.out	Mon Apr 06 23:13:53 2009 -0700
    80.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    80.3 @@ -1,13 +0,0 @@
    80.4 -<!-- BEGIN daily.files.add-dir -->
    80.5 -<screen><prompt>$</prompt> <userinput>mkdir b</userinput>
    80.6 -<prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
    80.7 -<prompt>$</prompt> <userinput>echo c &gt; b/c</userinput>
    80.8 -<prompt>$</prompt> <userinput>mkdir b/d</userinput>
    80.9 -<prompt>$</prompt> <userinput>echo d &gt; b/d/d</userinput>
   80.10 -<prompt>$</prompt> <userinput>hg add b</userinput>
   80.11 -adding b/b
   80.12 -adding b/c
   80.13 -adding b/d/d
   80.14 -<prompt>$</prompt> <userinput>hg commit -m 'Added all files in subdirectory'</userinput>
   80.15 -</screen>
   80.16 -<!-- END daily.files.add-dir -->

    81.1 --- a/en/examples/results/daily.files.add.out	Mon Apr 06 23:13:53 2009 -0700
    81.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    81.3 @@ -1,13 +0,0 @@
    81.4 -<!-- BEGIN daily.files.add -->
    81.5 -<screen><prompt>$</prompt> <userinput>hg init add-example</userinput>
    81.6 -<prompt>$</prompt> <userinput>cd add-example</userinput>
    81.7 -<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
    81.8 -<prompt>$</prompt> <userinput>hg status</userinput>
    81.9 -? a
   81.10 -<prompt>$</prompt> <userinput>hg add a</userinput>
   81.11 -<prompt>$</prompt> <userinput>hg status</userinput>
   81.12 -A a
   81.13 -<prompt>$</prompt> <userinput>hg commit -m 'Added one file'</userinput>
   81.14 -<prompt>$</prompt> <userinput>hg status</userinput>
   81.15 -</screen>
   81.16 -<!-- END daily.files.add -->

    82.1 --- a/en/examples/results/daily.files.addremove.out	Mon Apr 06 23:13:53 2009 -0700
    82.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    82.3 @@ -1,10 +0,0 @@
    82.4 -<!-- BEGIN daily.files.addremove -->
    82.5 -<screen><prompt>$</prompt> <userinput>hg init addremove-example</userinput>
    82.6 -<prompt>$</prompt> <userinput>cd addremove-example</userinput>
    82.7 -<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
    82.8 -<prompt>$</prompt> <userinput>echo b &gt; b</userinput>
    82.9 -<prompt>$</prompt> <userinput>hg addremove</userinput>
   82.10 -adding a
   82.11 -adding b
   82.12 -</screen>
   82.13 -<!-- END daily.files.addremove -->

    83.1 --- a/en/examples/results/daily.files.commit-addremove.out	Mon Apr 06 23:13:53 2009 -0700
    83.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    83.3 @@ -1,6 +0,0 @@
    83.4 -<!-- BEGIN daily.files.commit-addremove -->
    83.5 -<screen><prompt>$</prompt> <userinput>echo c &gt; c</userinput>
    83.6 -<prompt>$</prompt> <userinput>hg commit -A -m 'Commit with addremove'</userinput>
    83.7 -adding c
    83.8 -</screen>
    83.9 -<!-- END daily.files.commit-addremove -->

    84.1 --- a/en/examples/results/daily.files.hidden.out	Mon Apr 06 23:13:53 2009 -0700
    84.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    84.3 @@ -1,17 +0,0 @@
    84.4 -<!-- BEGIN daily.files.hidden -->
    84.5 -<screen><prompt>$</prompt> <userinput>hg init hidden-example</userinput>
    84.6 -<prompt>$</prompt> <userinput>cd hidden-example</userinput>
    84.7 -<prompt>$</prompt> <userinput>mkdir empty</userinput>
    84.8 -<prompt>$</prompt> <userinput>touch empty/.hidden</userinput>
    84.9 -<prompt>$</prompt> <userinput>hg add empty/.hidden</userinput>
   84.10 -<prompt>$</prompt> <userinput>hg commit -m 'Manage an empty-looking directory'</userinput>
   84.11 -<prompt>$</prompt> <userinput>ls empty</userinput>
   84.12 -<prompt>$</prompt> <userinput>cd ..</userinput>
   84.13 -<prompt>$</prompt> <userinput>hg clone hidden-example tmp</userinput>
   84.14 -updating working directory
   84.15 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   84.16 -<prompt>$</prompt> <userinput>ls tmp</userinput>
   84.17 -empty
   84.18 -<prompt>$</prompt> <userinput>ls tmp/empty</userinput>
   84.19 -</screen>
   84.20 -<!-- END daily.files.hidden -->

    85.1 --- a/en/examples/results/daily.files.missing.out	Mon Apr 06 23:13:53 2009 -0700
    85.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    85.3 @@ -1,11 +0,0 @@
    85.4 -<!-- BEGIN daily.files.missing -->
    85.5 -<screen><prompt>$</prompt> <userinput>hg init missing-example</userinput>
    85.6 -<prompt>$</prompt> <userinput>cd missing-example</userinput>
    85.7 -<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
    85.8 -<prompt>$</prompt> <userinput>hg add a</userinput>
    85.9 -<prompt>$</prompt> <userinput>hg commit -m 'File about to be missing'</userinput>
   85.10 -<prompt>$</prompt> <userinput>rm a</userinput>
   85.11 -<prompt>$</prompt> <userinput>hg status</userinput>
   85.12 -! a
   85.13 -</screen>
   85.14 -<!-- END daily.files.missing -->

    86.1 --- a/en/examples/results/daily.files.recover-missing.out	Mon Apr 06 23:13:53 2009 -0700
    86.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    86.3 @@ -1,7 +0,0 @@
    86.4 -<!-- BEGIN daily.files.recover-missing -->
    86.5 -<screen><prompt>$</prompt> <userinput>hg revert a</userinput>
    86.6 -<prompt>$</prompt> <userinput>cat a</userinput>
    86.7 -a
    86.8 -<prompt>$</prompt> <userinput>hg status</userinput>
    86.9 -</screen>
   86.10 -<!-- END daily.files.recover-missing -->

    87.1 --- a/en/examples/results/daily.files.remove-after.out	Mon Apr 06 23:13:53 2009 -0700
    87.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    87.3 @@ -1,6 +0,0 @@
    87.4 -<!-- BEGIN daily.files.remove-after -->
    87.5 -<screen><prompt>$</prompt> <userinput>hg remove --after a</userinput>
    87.6 -<prompt>$</prompt> <userinput>hg status</userinput>
    87.7 -R a
    87.8 -</screen>
    87.9 -<!-- END daily.files.remove-after -->

    88.1 --- a/en/examples/results/daily.files.remove.out	Mon Apr 06 23:13:53 2009 -0700
    88.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    88.3 @@ -1,16 +0,0 @@
    88.4 -<!-- BEGIN daily.files.remove -->
    88.5 -<screen><prompt>$</prompt> <userinput>hg init remove-example</userinput>
    88.6 -<prompt>$</prompt> <userinput>cd remove-example</userinput>
    88.7 -<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
    88.8 -<prompt>$</prompt> <userinput>mkdir b</userinput>
    88.9 -<prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
   88.10 -<prompt>$</prompt> <userinput>hg add a b</userinput>
   88.11 -adding b/b
   88.12 -<prompt>$</prompt> <userinput>hg commit -m 'Small example for file removal'</userinput>
   88.13 -<prompt>$</prompt> <userinput>hg remove a</userinput>
   88.14 -<prompt>$</prompt> <userinput>hg status</userinput>
   88.15 -R a
   88.16 -<prompt>$</prompt> <userinput>hg remove b</userinput>
   88.17 -removing b/b
   88.18 -</screen>
   88.19 -<!-- END daily.files.remove -->

    89.1 --- a/en/examples/results/daily.rename.rename.out	Mon Apr 06 23:13:53 2009 -0700
    89.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    89.3 @@ -1,4 +0,0 @@
    89.4 -<!-- BEGIN daily.rename.rename -->
    89.5 -<screen><prompt>$</prompt> <userinput>hg rename a b</userinput>
    89.6 -</screen>
    89.7 -<!-- END daily.rename.rename -->

    90.1 --- a/en/examples/results/daily.rename.status-copy.out	Mon Apr 06 23:13:53 2009 -0700
    90.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    90.3 @@ -1,7 +0,0 @@
    90.4 -<!-- BEGIN daily.rename.status-copy -->
    90.5 -<screen><prompt>$</prompt> <userinput>hg status -C</userinput>
    90.6 -A b
    90.7 -  a
    90.8 -R a
    90.9 -</screen>
   90.10 -<!-- END daily.rename.status-copy -->

    91.1 --- a/en/examples/results/daily.rename.status.out	Mon Apr 06 23:13:53 2009 -0700
    91.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    91.3 @@ -1,6 +0,0 @@
    91.4 -<!-- BEGIN daily.rename.status -->
    91.5 -<screen><prompt>$</prompt> <userinput>hg status</userinput>
    91.6 -A b
    91.7 -R a
    91.8 -</screen>
    91.9 -<!-- END daily.rename.status -->

    92.1 --- a/en/examples/results/daily.revert.add.out	Mon Apr 06 23:13:53 2009 -0700
    92.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    92.3 @@ -1,10 +0,0 @@
    92.4 -<!-- BEGIN daily.revert.add -->
    92.5 -<screen><prompt>$</prompt> <userinput>echo oops &gt; oops</userinput>
    92.6 -<prompt>$</prompt> <userinput>hg add oops</userinput>
    92.7 -<prompt>$</prompt> <userinput>hg status oops</userinput>
    92.8 -A oops
    92.9 -<prompt>$</prompt> <userinput>hg revert oops</userinput>
   92.10 -<prompt>$</prompt> <userinput>hg status</userinput>
   92.11 -? oops
   92.12 -</screen>
   92.13 -<!-- END daily.revert.add -->

    93.1 --- a/en/examples/results/daily.revert.copy.out	Mon Apr 06 23:13:53 2009 -0700
    93.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    93.3 @@ -1,7 +0,0 @@
    93.4 -<!-- BEGIN daily.revert.copy -->
    93.5 -<screen><prompt>$</prompt> <userinput>hg copy file new-file</userinput>
    93.6 -<prompt>$</prompt> <userinput>hg revert new-file</userinput>
    93.7 -<prompt>$</prompt> <userinput>hg status</userinput>
    93.8 -? new-file
    93.9 -</screen>
   93.10 -<!-- END daily.revert.copy -->

    94.1 --- a/en/examples/results/daily.revert.missing.out	Mon Apr 06 23:13:53 2009 -0700
    94.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    94.3 @@ -1,9 +0,0 @@
    94.4 -<!-- BEGIN daily.revert.missing -->
    94.5 -<screen><prompt>$</prompt> <userinput>rm file</userinput>
    94.6 -<prompt>$</prompt> <userinput>hg status</userinput>
    94.7 -! file
    94.8 -<prompt>$</prompt> <userinput>hg revert file</userinput>
    94.9 -<prompt>$</prompt> <userinput>ls file</userinput>
   94.10 -file
   94.11 -</screen>
   94.12 -<!-- END daily.revert.missing -->

    95.1 --- a/en/examples/results/daily.revert.modify.out	Mon Apr 06 23:13:53 2009 -0700
    95.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    95.3 @@ -1,13 +0,0 @@
    95.4 -<!-- BEGIN daily.revert.modify -->
    95.5 -<screen><prompt>$</prompt> <userinput>cat file</userinput>
    95.6 -original content
    95.7 -<prompt>$</prompt> <userinput>echo unwanted change &gt;&gt; file</userinput>
    95.8 -<prompt>$</prompt> <userinput>hg diff file</userinput>
    95.9 -diff -r  file
   95.10 -
   95.11 -
   95.12 -@@ -1,1 +1,2 @@
   95.13 - original content
   95.14 -+unwanted change
   95.15 -</screen>
   95.16 -<!-- END daily.revert.modify -->

    96.1 --- a/en/examples/results/daily.revert.remove.out	Mon Apr 06 23:13:53 2009 -0700
    96.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    96.3 @@ -1,10 +0,0 @@
    96.4 -<!-- BEGIN daily.revert.remove -->
    96.5 -<screen><prompt>$</prompt> <userinput>hg remove file</userinput>
    96.6 -<prompt>$</prompt> <userinput>hg status</userinput>
    96.7 -R file
    96.8 -<prompt>$</prompt> <userinput>hg revert file</userinput>
    96.9 -<prompt>$</prompt> <userinput>hg status</userinput>
   96.10 -<prompt>$</prompt> <userinput>ls file</userinput>
   96.11 -file
   96.12 -</screen>
   96.13 -<!-- END daily.revert.remove -->

    97.1 --- a/en/examples/results/daily.revert.rename-orig.out	Mon Apr 06 23:13:53 2009 -0700
    97.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    97.3 @@ -1,7 +0,0 @@
    97.4 -<!-- BEGIN daily.revert.rename-orig -->
    97.5 -<screen><prompt>$</prompt> <userinput>hg revert file</userinput>
    97.6 -no changes needed to file
    97.7 -<prompt>$</prompt> <userinput>hg status</userinput>
    97.8 -? new-file
    97.9 -</screen>
   97.10 -<!-- END daily.revert.rename-orig -->

    98.1 --- a/en/examples/results/daily.revert.rename.out	Mon Apr 06 23:13:53 2009 -0700
    98.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    98.3 @@ -1,7 +0,0 @@
    98.4 -<!-- BEGIN daily.revert.rename -->
    98.5 -<screen><prompt>$</prompt> <userinput>hg rename file new-file</userinput>
    98.6 -<prompt>$</prompt> <userinput>hg revert new-file</userinput>
    98.7 -<prompt>$</prompt> <userinput>hg status</userinput>
    98.8 -? new-file
    98.9 -</screen>
   98.10 -<!-- END daily.revert.rename -->

    99.1 --- a/en/examples/results/daily.revert.status.out	Mon Apr 06 23:13:53 2009 -0700
    99.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    99.3 @@ -1,8 +0,0 @@
    99.4 -<!-- BEGIN daily.revert.status -->
    99.5 -<screen><prompt>$</prompt> <userinput>hg status</userinput>
    99.6 -? file.orig
    99.7 -<prompt>$</prompt> <userinput>cat file.orig</userinput>
    99.8 -original content
    99.9 -unwanted change
   99.10 -</screen>
   99.11 -<!-- END daily.revert.status -->

   100.1 --- a/en/examples/results/daily.revert.unmodify.out	Mon Apr 06 23:13:53 2009 -0700
   100.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   100.3 @@ -1,8 +0,0 @@
   100.4 -<!-- BEGIN daily.revert.unmodify -->
   100.5 -<screen><prompt>$</prompt> <userinput>hg status</userinput>
   100.6 -M file
   100.7 -<prompt>$</prompt> <userinput>hg revert file</userinput>
   100.8 -<prompt>$</prompt> <userinput>cat file</userinput>
   100.9 -original content
  100.10 -</screen>
  100.11 -<!-- END daily.revert.unmodify -->

   101.1 --- a/en/examples/results/extdiff.diff.out	Mon Apr 06 23:13:53 2009 -0700
   101.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   101.3 @@ -1,10 +0,0 @@
   101.4 -<!-- BEGIN extdiff.diff -->
   101.5 -<screen><prompt>$</prompt> <userinput>hg diff</userinput>
   101.6 -diff -r  myfile
   101.7 -
   101.8 -
   101.9 -@@ -1,1 +1,2 @@
  101.10 - The first line.
  101.11 -+The second line.
  101.12 -</screen>
  101.13 -<!-- END extdiff.diff -->

   102.1 --- a/en/examples/results/extdiff.extdiff-ctx.out	Mon Apr 06 23:13:53 2009 -0700
   102.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   102.3 @@ -1,11 +0,0 @@
   102.4 -<!-- BEGIN extdiff.extdiff-ctx -->
   102.5 -<screen><prompt>$</prompt> <userinput>hg extdiff -o -NprcC5</userinput>
   102.6 -
   102.7 -
   102.8 -***************
   102.9 -*** 1 ****
  102.10 -
  102.11 -  The first line.
  102.12 -+ The second line.
  102.13 -</screen>
  102.14 -<!-- END extdiff.extdiff-ctx -->

   103.1 --- a/en/examples/results/extdiff.extdiff.out	Mon Apr 06 23:13:53 2009 -0700
   103.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   103.3 @@ -1,9 +0,0 @@
   103.4 -<!-- BEGIN extdiff.extdiff -->
   103.5 -<screen><prompt>$</prompt> <userinput>hg extdiff</userinput>
   103.6 -
   103.7 -
   103.8 -@@ -1 +1,2 @@
   103.9 - The first line.
  103.10 -+The second line.
  103.11 -</screen>
  103.12 -<!-- END extdiff.extdiff -->

   104.1 --- a/en/examples/results/filenames.dirs.out	Mon Apr 06 23:13:53 2009 -0700
   104.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   104.3 @@ -1,8 +0,0 @@
   104.4 -<!-- BEGIN filenames.dirs -->
   104.5 -<screen><prompt>$</prompt> <userinput>hg status src</userinput>
   104.6 -? src/main.py
   104.7 -? src/watcher/_watcher.c
   104.8 -? src/watcher/watcher.py
   104.9 -? src/xyzzy.txt
  104.10 -</screen>
  104.11 -<!-- END filenames.dirs -->

   105.1 --- a/en/examples/results/filenames.files.out	Mon Apr 06 23:13:53 2009 -0700
   105.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   105.3 @@ -1,4 +0,0 @@
   105.4 -<!-- BEGIN filenames.files -->
   105.5 -<screen><prompt>$</prompt> <userinput>hg add COPYING README examples/simple.py</userinput>
   105.6 -</screen>
   105.7 -<!-- END filenames.files -->

   106.1 --- a/en/examples/results/filenames.filter.exclude.out	Mon Apr 06 23:13:53 2009 -0700
   106.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   106.3 @@ -1,6 +0,0 @@
   106.4 -<!-- BEGIN filenames.filter.exclude -->
   106.5 -<screen><prompt>$</prompt> <userinput>hg status -X '**.py' src</userinput>
   106.6 -? src/watcher/_watcher.c
   106.7 -? src/xyzzy.txt
   106.8 -</screen>
   106.9 -<!-- END filenames.filter.exclude -->

   107.1 --- a/en/examples/results/filenames.filter.include.out	Mon Apr 06 23:13:53 2009 -0700
   107.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   107.3 @@ -1,5 +0,0 @@
   107.4 -<!-- BEGIN filenames.filter.include -->
   107.5 -<screen><prompt>$</prompt> <userinput>hg status -I '*.in'</userinput>
   107.6 -? MANIFEST.in
   107.7 -</screen>
   107.8 -<!-- END filenames.filter.include -->

   108.1 --- a/en/examples/results/filenames.glob.group.out	Mon Apr 06 23:13:53 2009 -0700
   108.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   108.3 @@ -1,6 +0,0 @@
   108.4 -<!-- BEGIN filenames.glob.group -->
   108.5 -<screen><prompt>$</prompt> <userinput>hg status 'glob:*.{in,py}'</userinput>
   108.6 -? MANIFEST.in
   108.7 -? setup.py
   108.8 -</screen>
   108.9 -<!-- END filenames.glob.group -->

   109.1 --- a/en/examples/results/filenames.glob.question.out	Mon Apr 06 23:13:53 2009 -0700
   109.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   109.3 @@ -1,5 +0,0 @@
   109.4 -<!-- BEGIN filenames.glob.question -->
   109.5 -<screen><prompt>$</prompt> <userinput>hg status 'glob:**.?'</userinput>
   109.6 -? src/watcher/_watcher.c
   109.7 -</screen>
   109.8 -<!-- END filenames.glob.question -->

   110.1 --- a/en/examples/results/filenames.glob.range.out	Mon Apr 06 23:13:53 2009 -0700
   110.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   110.3 @@ -1,6 +0,0 @@
   110.4 -<!-- BEGIN filenames.glob.range -->
   110.5 -<screen><prompt>$</prompt> <userinput>hg status 'glob:**[nr-t]'</userinput>
   110.6 -? MANIFEST.in
   110.7 -? src/xyzzy.txt
   110.8 -</screen>
   110.9 -<!-- END filenames.glob.range -->

   111.1 --- a/en/examples/results/filenames.glob.star-starstar.out	Mon Apr 06 23:13:53 2009 -0700
   111.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   111.3 @@ -1,11 +0,0 @@
   111.4 -<!-- BEGIN filenames.glob.star-starstar -->
   111.5 -<screen><prompt>$</prompt> <userinput>hg status 'glob:*.py'</userinput>
   111.6 -? setup.py
   111.7 -<prompt>$</prompt> <userinput>hg status 'glob:**.py'</userinput>
   111.8 -A examples/simple.py
   111.9 -A src/main.py
  111.10 -? examples/performant.py
  111.11 -? setup.py
  111.12 -? src/watcher/watcher.py
  111.13 -</screen>
  111.14 -<!-- END filenames.glob.star-starstar -->

   112.1 --- a/en/examples/results/filenames.glob.star.out	Mon Apr 06 23:13:53 2009 -0700
   112.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   112.3 @@ -1,5 +0,0 @@
   112.4 -<!-- BEGIN filenames.glob.star -->
   112.5 -<screen><prompt>$</prompt> <userinput>hg add 'glob:*.py'</userinput>
   112.6 -adding main.py
   112.7 -</screen>
   112.8 -<!-- END filenames.glob.star -->

   113.1 --- a/en/examples/results/filenames.glob.starstar.out	Mon Apr 06 23:13:53 2009 -0700
   113.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   113.3 @@ -1,10 +0,0 @@
   113.4 -<!-- BEGIN filenames.glob.starstar -->
   113.5 -<screen><prompt>$</prompt> <userinput>cd ..</userinput>
   113.6 -<prompt>$</prompt> <userinput>hg status 'glob:**.py'</userinput>
   113.7 -A examples/simple.py
   113.8 -A src/main.py
   113.9 -? examples/performant.py
  113.10 -? setup.py
  113.11 -? src/watcher/watcher.py
  113.12 -</screen>
  113.13 -<!-- END filenames.glob.starstar -->

   114.1 --- a/en/examples/results/filenames.wdir-relname.out	Mon Apr 06 23:13:53 2009 -0700
   114.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   114.3 @@ -1,25 +0,0 @@
   114.4 -<!-- BEGIN filenames.wdir-relname -->
   114.5 -<screen><prompt>$</prompt> <userinput>hg status</userinput>
   114.6 -A COPYING
   114.7 -A README
   114.8 -A examples/simple.py
   114.9 -? MANIFEST.in
  114.10 -? examples/performant.py
  114.11 -? setup.py
  114.12 -? src/main.py
  114.13 -? src/watcher/_watcher.c
  114.14 -? src/watcher/watcher.py
  114.15 -? src/xyzzy.txt
  114.16 -<prompt>$</prompt> <userinput>hg status `hg root`</userinput>
  114.17 -A ../COPYING
  114.18 -A ../README
  114.19 -A ../examples/simple.py
  114.20 -? ../MANIFEST.in
  114.21 -? ../examples/performant.py
  114.22 -? ../setup.py
  114.23 -? main.py
  114.24 -? watcher/_watcher.c
  114.25 -? watcher/watcher.py
  114.26 -? xyzzy.txt
  114.27 -</screen>
  114.28 -<!-- END filenames.wdir-relname -->

   115.1 --- a/en/examples/results/filenames.wdir-subdir.out	Mon Apr 06 23:13:53 2009 -0700
   115.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   115.3 @@ -1,17 +0,0 @@
   115.4 -<!-- BEGIN filenames.wdir-subdir -->
   115.5 -<screen><prompt>$</prompt> <userinput>cd src</userinput>
   115.6 -<prompt>$</prompt> <userinput>hg add -n</userinput>
   115.7 -adding ../MANIFEST.in
   115.8 -adding ../examples/performant.py
   115.9 -adding ../setup.py
  115.10 -adding main.py
  115.11 -adding watcher/_watcher.c
  115.12 -adding watcher/watcher.py
  115.13 -adding xyzzy.txt
  115.14 -<prompt>$</prompt> <userinput>hg add -n .</userinput>
  115.15 -adding main.py
  115.16 -adding watcher/_watcher.c
  115.17 -adding watcher/watcher.py
  115.18 -adding xyzzy.txt
  115.19 -</screen>
  115.20 -<!-- END filenames.wdir-subdir -->

   116.1 --- a/en/examples/results/hook.msglen.go.out	Mon Apr 06 23:13:53 2009 -0700
   116.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   116.3 @@ -1,13 +0,0 @@
   116.4 -<!-- BEGIN hook.msglen.go -->
   116.5 -<screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput>
   116.6 -[hooks]
   116.7 -pretxncommit.msglen = test `hg tip --template {desc} | wc -c` -ge 10
   116.8 -<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
   116.9 -<prompt>$</prompt> <userinput>hg add a</userinput>
  116.10 -<prompt>$</prompt> <userinput>hg commit -A -m 'too short'</userinput>
  116.11 -transaction abort!
  116.12 -rollback completed
  116.13 -abort: pretxncommit.msglen hook exited with status 1
  116.14 -<prompt>$</prompt> <userinput>hg commit -A -m 'long enough'</userinput>
  116.15 -</screen>
  116.16 -<!-- END hook.msglen.go -->

   117.1 --- a/en/examples/results/hook.msglen.run.out	Mon Apr 06 23:13:53 2009 -0700
   117.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   117.3 @@ -1,10 +0,0 @@
   117.4 -$ \textbf{cat .hg/hgrc}
   117.5 -[hooks]
   117.6 -pretxncommit.msglen = test `hg tip --template \{desc\} | wc -c` -ge 10
   117.7 -$ \textbf{echo a > a}
   117.8 -$ \textbf{hg add a}
   117.9 -$ \textbf{hg commit -A -m 'too short'}
  117.10 -abort: pretxncommit.msglen hook exited with status 1
  117.11 -transaction abort!
  117.12 -rollback completed
  117.13 -$ \textbf{hg commit -A -m 'long enough'}

   118.1 --- a/en/examples/results/hook.simple.ext.out	Mon Apr 06 23:13:53 2009 -0700
   118.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   118.3 @@ -1,8 +0,0 @@
   118.4 -<!-- BEGIN hook.simple.ext -->
   118.5 -<screen><prompt>$</prompt> <userinput>echo 'commit.when = echo -n "date of commit: "; date' &gt;&gt; .hg/hgrc</userinput>
   118.6 -<prompt>$</prompt> <userinput>echo a &gt;&gt; a</userinput>
   118.7 -<prompt>$</prompt> <userinput>hg commit -m 'i have two hooks'</userinput>
   118.8 -committed 
   118.9 -
  118.10 -</screen>
  118.11 -<!-- END hook.simple.ext -->

   119.1 --- a/en/examples/results/hook.simple.init.out	Mon Apr 06 23:13:53 2009 -0700
   119.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   119.3 @@ -1,14 +0,0 @@
   119.4 -<!-- BEGIN hook.simple.init -->
   119.5 -<screen><prompt>$</prompt> <userinput>hg init hook-test</userinput>
   119.6 -<prompt>$</prompt> <userinput>cd hook-test</userinput>
   119.7 -<prompt>$</prompt> <userinput>echo '[hooks]' &gt;&gt; .hg/hgrc</userinput>
   119.8 -<prompt>$</prompt> <userinput>echo 'commit = echo committed $HG_NODE' &gt;&gt; .hg/hgrc</userinput>
   119.9 -<prompt>$</prompt> <userinput>cat .hg/hgrc</userinput>
  119.10 -[hooks]
  119.11 -commit = echo committed $HG_NODE
  119.12 -<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
  119.13 -<prompt>$</prompt> <userinput>hg add a</userinput>
  119.14 -<prompt>$</prompt> <userinput>hg commit -m 'testing commit hook'</userinput>
  119.15 -committed 
  119.16 -</screen>
  119.17 -<!-- END hook.simple.init -->

   120.1 --- a/en/examples/results/hook.simple.pretxncommit.out	Mon Apr 06 23:13:53 2009 -0700
   120.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   120.3 @@ -1,16 +0,0 @@
   120.4 -<!-- BEGIN hook.simple.pretxncommit -->
   120.5 -<screen><prompt>$</prompt> <userinput>cat check_bug_id</userinput>
   120.6 -#!/bin/sh
   120.7 -# check that a commit comment mentions a numeric bug id
   120.8 -hg log -r $1 --template {desc} | grep -q "\&lt;bug *[0-9]"
   120.9 -<prompt>$</prompt> <userinput>echo 'pretxncommit.bug_id_required = ./check_bug_id $HG_NODE' &gt;&gt; .hg/hgrc</userinput>
  120.10 -<prompt>$</prompt> <userinput>echo a &gt;&gt; a</userinput>
  120.11 -<prompt>$</prompt> <userinput>hg commit -m 'i am not mentioning a bug id'</userinput>
  120.12 -transaction abort!
  120.13 -rollback completed
  120.14 -abort: pretxncommit.bug_id_required hook exited with status 1
  120.15 -<prompt>$</prompt> <userinput>hg commit -m 'i refer you to bug 666'</userinput>
  120.16 -committed 
  120.17 -
  120.18 -</screen>
  120.19 -<!-- END hook.simple.pretxncommit -->

   121.1 --- a/en/examples/results/hook.ws.better.out	Mon Apr 06 23:13:53 2009 -0700
   121.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   121.3 @@ -1,20 +0,0 @@
   121.4 -<!-- BEGIN hook.ws.better -->
   121.5 -<screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput>
   121.6 -[hooks]
   121.7 -pretxncommit.whitespace = .hg/check_whitespace.py
   121.8 -<prompt>$</prompt> <userinput>echo 'a ' &gt;&gt; a</userinput>
   121.9 -<prompt>$</prompt> <userinput>hg commit -A -m 'add new line with trailing whitespace'</userinput>
  121.10 -a, line 2: trailing whitespace added
  121.11 -commit message saved to .hg/commit.save
  121.12 -transaction abort!
  121.13 -rollback completed
  121.14 -abort: pretxncommit.whitespace hook exited with status 1
  121.15 -<prompt>$</prompt> <userinput>sed -i 's, *$,,' a</userinput>
  121.16 -<prompt>$</prompt> <userinput>hg commit -A -m 'trimmed trailing whitespace'</userinput>
  121.17 -a, line 2: trailing whitespace added
  121.18 -commit message saved to .hg/commit.save
  121.19 -transaction abort!
  121.20 -rollback completed
  121.21 -abort: pretxncommit.whitespace hook exited with status 1
  121.22 -</screen>
  121.23 -<!-- END hook.ws.better -->

   122.1 --- a/en/examples/results/hook.ws.simple.out	Mon Apr 06 23:13:53 2009 -0700
   122.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   122.3 @@ -1,14 +0,0 @@
   122.4 -<!-- BEGIN hook.ws.simple -->
   122.5 -<screen><prompt>$</prompt> <userinput>cat .hg/hgrc</userinput>
   122.6 -[hooks]
   122.7 -pretxncommit.whitespace = hg export tip | (! egrep -q '^\+.*[ \t]$')
   122.8 -<prompt>$</prompt> <userinput>echo 'a ' &gt; a</userinput>
   122.9 -<prompt>$</prompt> <userinput>hg commit -A -m 'test with trailing whitespace'</userinput>
  122.10 -adding a
  122.11 -transaction abort!
  122.12 -rollback completed
  122.13 -abort: pretxncommit.whitespace hook exited with status 1
  122.14 -<prompt>$</prompt> <userinput>echo 'a' &gt; a</userinput>
  122.15 -<prompt>$</prompt> <userinput>hg commit -A -m 'drop trailing whitespace and try again'</userinput>
  122.16 -</screen>
  122.17 -<!-- END hook.ws.simple -->

   123.1 --- a/en/examples/results/issue29.go.out	Mon Apr 06 23:13:53 2009 -0700
   123.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   123.3 @@ -1,20 +0,0 @@
   123.4 -<!-- BEGIN issue29.go -->
   123.5 -<screen><prompt>$</prompt> <userinput>hg init issue29</userinput>
   123.6 -<prompt>$</prompt> <userinput>cd issue29</userinput>
   123.7 -<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
   123.8 -<prompt>$</prompt> <userinput>hg ci -Ama</userinput>
   123.9 -adding a
  123.10 -<prompt>$</prompt> <userinput>echo b &gt; b</userinput>
  123.11 -<prompt>$</prompt> <userinput>hg ci -Amb</userinput>
  123.12 -adding b
  123.13 -<prompt>$</prompt> <userinput>hg up 0</userinput>
  123.14 -0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  123.15 -<prompt>$</prompt> <userinput>mkdir b</userinput>
  123.16 -<prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
  123.17 -<prompt>$</prompt> <userinput>hg ci -Amc</userinput>
  123.18 -adding b/b
  123.19 -created new head
  123.20 -<prompt>$</prompt> <userinput>hg merge</userinput>
  123.21 -
  123.22 -</screen>
  123.23 -<!-- END issue29.go -->

   124.1 --- a/en/examples/results/mq.dodiff.diff.out	Mon Apr 06 23:13:53 2009 -0700
   124.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   124.3 @@ -1,16 +0,0 @@
   124.4 -<!-- BEGIN mq.dodiff.diff -->
   124.5 -<screen><prompt>$</prompt> <userinput>echo 'this is my original thought' &gt; oldfile</userinput>
   124.6 -<prompt>$</prompt> <userinput>echo 'i have changed my mind' &gt; newfile</userinput>
   124.7 -<prompt>$</prompt> <userinput>diff -u oldfile newfile &gt; tiny.patch</userinput>
   124.8 -<prompt>$</prompt> <userinput>cat tiny.patch</userinput>
   124.9 -
  124.10 -
  124.11 -@@ -1 +1 @@
  124.12 --this is my original thought
  124.13 -+i have changed my mind
  124.14 -<prompt>$</prompt> <userinput>patch &lt; tiny.patch</userinput>
  124.15 -patching file oldfile
  124.16 -<prompt>$</prompt> <userinput>cat oldfile</userinput>
  124.17 -i have changed my mind
  124.18 -</screen>
  124.19 -<!-- END mq.dodiff.diff -->

   125.1 --- a/en/examples/results/mq.guards.init.out	Mon Apr 06 23:13:53 2009 -0700
   125.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   125.3 @@ -1,12 +0,0 @@
   125.4 -<!-- BEGIN mq.guards.init -->
   125.5 -<screen><prompt>$</prompt> <userinput>hg qinit</userinput>
   125.6 -<prompt>$</prompt> <userinput>hg qnew hello.patch</userinput>
   125.7 -<prompt>$</prompt> <userinput>echo hello &gt; hello</userinput>
   125.8 -<prompt>$</prompt> <userinput>hg add hello</userinput>
   125.9 -<prompt>$</prompt> <userinput>hg qrefresh</userinput>
  125.10 -<prompt>$</prompt> <userinput>hg qnew goodbye.patch</userinput>
  125.11 -<prompt>$</prompt> <userinput>echo goodbye &gt; goodbye</userinput>
  125.12 -<prompt>$</prompt> <userinput>hg add goodbye</userinput>
  125.13 -<prompt>$</prompt> <userinput>hg qrefresh</userinput>
  125.14 -</screen>
  125.15 -<!-- END mq.guards.init -->

   126.1 --- a/en/examples/results/mq.guards.qguard.neg.out	Mon Apr 06 23:13:53 2009 -0700
   126.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   126.3 @@ -1,30 +0,0 @@
   126.4 -<!-- BEGIN mq.guards.qguard.neg -->
   126.5 -<screen><prompt>$</prompt> <userinput>hg qguard hello.patch -quux</userinput>
   126.6 -hg qguard: option -u not recognized
   126.7 -hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]...
   126.8 -
   126.9 -set or print guards for a patch
  126.10 -
  126.11 -    Guards control whether a patch can be pushed. A patch with no
  126.12 -    guards is always pushed. A patch with a positive guard ("+foo") is
  126.13 -    pushed only if the qselect command has activated it. A patch with
  126.14 -    a negative guard ("-foo") is never pushed if the qselect command
  126.15 -    has activated it.
  126.16 -
  126.17 -    With no arguments, print the currently active guards.
  126.18 -    With arguments, set guards for the named patch.
  126.19 -    NOTE: Specifying negative guards now requires '--'.
  126.20 -
  126.21 -    To set guards on another patch:
  126.22 -      hg qguard -- other.patch +2.6.17 -stable
  126.23 -
  126.24 -options:
  126.25 -
  126.26 - -l --list  list all patches and guards
  126.27 - -n --none  drop all guards
  126.28 -
  126.29 -use "hg -v help qguard" to show global options
  126.30 -<prompt>$</prompt> <userinput>hg qguard hello.patch</userinput>
  126.31 -hello.patch: unguarded
  126.32 -</screen>
  126.33 -<!-- END mq.guards.qguard.neg -->

   127.1 --- a/en/examples/results/mq.guards.qguard.out	Mon Apr 06 23:13:53 2009 -0700
   127.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   127.3 @@ -1,5 +0,0 @@
   127.4 -<!-- BEGIN mq.guards.qguard -->
   127.5 -<screen><prompt>$</prompt> <userinput>hg qguard</userinput>
   127.6 -goodbye.patch: unguarded
   127.7 -</screen>
   127.8 -<!-- END mq.guards.qguard -->

   128.1 --- a/en/examples/results/mq.guards.qguard.pos.out	Mon Apr 06 23:13:53 2009 -0700
   128.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   128.3 @@ -1,6 +0,0 @@
   128.4 -<!-- BEGIN mq.guards.qguard.pos -->
   128.5 -<screen><prompt>$</prompt> <userinput>hg qguard +foo</userinput>
   128.6 -<prompt>$</prompt> <userinput>hg qguard</userinput>
   128.7 -goodbye.patch: +foo
   128.8 -</screen>
   128.9 -<!-- END mq.guards.qguard.pos -->

   129.1 --- a/en/examples/results/mq.guards.qselect.cat.out	Mon Apr 06 23:13:53 2009 -0700
   129.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   129.3 @@ -1,5 +0,0 @@
   129.4 -<!-- BEGIN mq.guards.qselect.cat -->
   129.5 -<screen><prompt>$</prompt> <userinput>cat .hg/patches/guards</userinput>
   129.6 -foo
   129.7 -</screen>
   129.8 -<!-- END mq.guards.qselect.cat -->

   130.1 --- a/en/examples/results/mq.guards.qselect.error.out	Mon Apr 06 23:13:53 2009 -0700
   130.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   130.3 @@ -1,5 +0,0 @@
   130.4 -<!-- BEGIN mq.guards.qselect.error -->
   130.5 -<screen><prompt>$</prompt> <userinput>hg qselect +foo</userinput>
   130.6 -abort: guard '+foo' starts with invalid character: '+'
   130.7 -</screen>
   130.8 -<!-- END mq.guards.qselect.error -->

   131.1 --- a/en/examples/results/mq.guards.qselect.foo.out	Mon Apr 06 23:13:53 2009 -0700
   131.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   131.3 @@ -1,11 +0,0 @@
   131.4 -<!-- BEGIN mq.guards.qselect.foo -->
   131.5 -<screen><prompt>$</prompt> <userinput>hg qpop -a</userinput>
   131.6 -patch queue now empty
   131.7 -<prompt>$</prompt> <userinput>hg qselect</userinput>
   131.8 -no active guards
   131.9 -<prompt>$</prompt> <userinput>hg qselect foo</userinput>
  131.10 -number of unguarded, unapplied patches has changed from 1 to 2
  131.11 -<prompt>$</prompt> <userinput>hg qselect</userinput>
  131.12 -foo
  131.13 -</screen>
  131.14 -<!-- END mq.guards.qselect.foo -->

   132.1 --- a/en/examples/results/mq.guards.qselect.foobar.out	Mon Apr 06 23:13:53 2009 -0700
   132.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   132.3 @@ -1,11 +0,0 @@
   132.4 -<!-- BEGIN mq.guards.qselect.foobar -->
   132.5 -<screen><prompt>$</prompt> <userinput>hg qselect foo bar</userinput>
   132.6 -number of unguarded, unapplied patches has changed from 0 to 1
   132.7 -<prompt>$</prompt> <userinput>hg qpop -a</userinput>
   132.8 -patch queue now empty
   132.9 -<prompt>$</prompt> <userinput>hg qpush -a</userinput>
  132.10 -applying hello.patch
  132.11 -applying goodbye.patch
  132.12 -now at: goodbye.patch
  132.13 -</screen>
  132.14 -<!-- END mq.guards.qselect.foobar -->

   133.1 --- a/en/examples/results/mq.guards.qselect.qpush.out	Mon Apr 06 23:13:53 2009 -0700
   133.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   133.3 @@ -1,7 +0,0 @@
   133.4 -<!-- BEGIN mq.guards.qselect.qpush -->
   133.5 -<screen><prompt>$</prompt> <userinput>hg qpush -a</userinput>
   133.6 -applying hello.patch
   133.7 -applying goodbye.patch
   133.8 -now at: goodbye.patch
   133.9 -</screen>
  133.10 -<!-- END mq.guards.qselect.qpush -->

   134.1 --- a/en/examples/results/mq.guards.qselect.quux.out	Mon Apr 06 23:13:53 2009 -0700
   134.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   134.3 @@ -1,11 +0,0 @@
   134.4 -<!-- BEGIN mq.guards.qselect.quux -->
   134.5 -<screen><prompt>$</prompt> <userinput>hg qselect quux</userinput>
   134.6 -number of guarded, applied patches has changed from 0 to 1
   134.7 -<prompt>$</prompt> <userinput>hg qpop -a</userinput>
   134.8 -patch queue now empty
   134.9 -<prompt>$</prompt> <userinput>hg qpush -a</userinput>
  134.10 -applying hello.patch
  134.11 -skipping goodbye.patch - guarded by ['+foo']
  134.12 -now at: hello.patch
  134.13 -</screen>
  134.14 -<!-- END mq.guards.qselect.quux -->

   135.1 --- a/en/examples/results/mq.guards.series.out	Mon Apr 06 23:13:53 2009 -0700
   135.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   135.3 @@ -1,6 +0,0 @@
   135.4 -<!-- BEGIN mq.guards.series -->
   135.5 -<screen><prompt>$</prompt> <userinput>cat .hg/patches/series</userinput>
   135.6 -hello.patch
   135.7 -goodbye.patch #+foo
   135.8 -</screen>
   135.9 -<!-- END mq.guards.series -->

   136.1 --- a/en/examples/results/mq.id.out.out	Mon Apr 06 23:13:53 2009 -0700
   136.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   136.3 @@ -1,32 +0,0 @@
   136.4 -$ \textbf{hg qapplied}
   136.5 -first.patch
   136.6 -second.patch
   136.7 -$ \textbf{hg log -r qbase:qtip}
   136.8 -changeset:   
   136.9 -tag:         first.patch
  136.10 -tag:         qbase
  136.11 -user:        Bryan O'Sullivan <bos@serpentine.com>
  136.12 -
  136.13 -summary:     patch queue: first.patch
  136.14 -
  136.15 -changeset:   
  136.16 -tag:         second.patch
  136.17 -tag:         qtip
  136.18 -tag:         tip
  136.19 -user:        Bryan O'Sullivan <bos@serpentine.com>
  136.20 -
  136.21 -summary:     patch queue: second.patch
  136.22 -
  136.23 -$ \textbf{hg export second.patch}
  136.24 -# HG changeset patch
  136.25 -# User Bryan O'Sullivan <bos@serpentine.com>
  136.26 -
  136.27 -# Node ID 
  136.28 -# Parent  
  136.29 -patch queue: second.patch
  136.30 -
  136.31 -diff -r  -r  other.c
  136.32 -
  136.33 -
  136.34 -@@ -0,0 +1,1 @@
  136.35 -+double u;

   137.1 --- a/en/examples/results/mq.id.output.out	Mon Apr 06 23:13:53 2009 -0700
   137.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   137.3 @@ -1,35 +0,0 @@
   137.4 -<!-- BEGIN mq.id.output -->
   137.5 -<screen><prompt>$</prompt> <userinput>hg qapplied</userinput>
   137.6 -first.patch
   137.7 -second.patch
   137.8 -<prompt>$</prompt> <userinput>hg log -r qbase:qtip</userinput>
   137.9 -changeset:   
  137.10 -tag:         first.patch
  137.11 -tag:         qbase
  137.12 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  137.13 -
  137.14 -summary:     [mq]: first.patch
  137.15 -
  137.16 -changeset:   
  137.17 -tag:         qtip
  137.18 -tag:         second.patch
  137.19 -tag:         tip
  137.20 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  137.21 -
  137.22 -summary:     [mq]: second.patch
  137.23 -
  137.24 -<prompt>$</prompt> <userinput>hg export second.patch</userinput>
  137.25 -# HG changeset patch
  137.26 -# User Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  137.27 -
  137.28 -# Node ID 
  137.29 -# Parent  
  137.30 -[mq]: second.patch
  137.31 -
  137.32 -diff -r  -r  other.c
  137.33 -
  137.34 -
  137.35 -@@ -0,0 +1,1 @@
  137.36 -+double u;
  137.37 -</screen>
  137.38 -<!-- END mq.id.output -->

   138.1 --- a/en/examples/results/mq.qinit-help.help.out	Mon Apr 06 23:13:53 2009 -0700
   138.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   138.3 @@ -1,19 +0,0 @@
   138.4 -<!-- BEGIN mq.qinit-help.help -->
   138.5 -<screen><prompt>$</prompt> <userinput>hg help qinit</userinput>
   138.6 -hg qinit [-c]
   138.7 -
   138.8 -init a new queue repository
   138.9 -
  138.10 -    The queue repository is unversioned by default. If -c is
  138.11 -    specified, qinit will create a separate nested repository
  138.12 -    for patches (qinit -c may also be run later to convert
  138.13 -    an unversioned patch repository into a versioned one).
  138.14 -    You can use qcommit to commit changes to this queue repository.
  138.15 -
  138.16 -options:
  138.17 -
  138.18 - -c --create-repo  create queue repository
  138.19 -
  138.20 -use "hg -v help qinit" to show global options
  138.21 -</screen>
  138.22 -<!-- END mq.qinit-help.help -->

   139.1 --- a/en/examples/results/mq.tarball.download.out	Mon Apr 06 23:13:53 2009 -0700
   139.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   139.3 @@ -1,12 +0,0 @@
   139.4 -<!-- BEGIN mq.tarball.download -->
   139.5 -<screen><prompt>$</prompt> <userinput>download netplug-1.2.5.tar.bz2</userinput>
   139.6 -<prompt>$</prompt> <userinput>tar jxf netplug-1.2.5.tar.bz2</userinput>
   139.7 -<prompt>$</prompt> <userinput>cd netplug-1.2.5</userinput>
   139.8 -<prompt>$</prompt> <userinput>hg init</userinput>
   139.9 -<prompt>$</prompt> <userinput>hg commit -q --addremove --message netplug-1.2.5</userinput>
  139.10 -<prompt>$</prompt> <userinput>cd ..</userinput>
  139.11 -<prompt>$</prompt> <userinput>hg clone netplug-1.2.5 netplug</userinput>
  139.12 -updating working directory
  139.13 -18 files updated, 0 files merged, 0 files removed, 0 files unresolved
  139.14 -</screen>
  139.15 -<!-- END mq.tarball.download -->

   140.1 --- a/en/examples/results/mq.tarball.newsource.out	Mon Apr 06 23:13:53 2009 -0700
   140.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   140.3 @@ -1,16 +0,0 @@
   140.4 -<!-- BEGIN mq.tarball.newsource -->
   140.5 -<screen><prompt>$</prompt> <userinput>hg qpop -a</userinput>
   140.6 -patch queue now empty
   140.7 -<prompt>$</prompt> <userinput>cd ..</userinput>
   140.8 -<prompt>$</prompt> <userinput>download netplug-1.2.8.tar.bz2</userinput>
   140.9 -<prompt>$</prompt> <userinput>hg clone netplug-1.2.5 netplug-1.2.8</userinput>
  140.10 -updating working directory
  140.11 -18 files updated, 0 files merged, 0 files removed, 0 files unresolved
  140.12 -<prompt>$</prompt> <userinput>cd netplug-1.2.8</userinput>
  140.13 -<prompt>$</prompt> <userinput>hg locate -0 | xargs -0 rm</userinput>
  140.14 -<prompt>$</prompt> <userinput>cd ..</userinput>
  140.15 -<prompt>$</prompt> <userinput>tar jxf netplug-1.2.8.tar.bz2</userinput>
  140.16 -<prompt>$</prompt> <userinput>cd netplug-1.2.8</userinput>
  140.17 -<prompt>$</prompt> <userinput>hg commit --addremove --message netplug-1.2.8</userinput>
  140.18 -</screen>
  140.19 -<!-- END mq.tarball.newsource -->

   141.1 --- a/en/examples/results/mq.tarball.qinit.out	Mon Apr 06 23:13:53 2009 -0700
   141.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   141.3 @@ -1,31 +0,0 @@
   141.4 -<!-- BEGIN mq.tarball.qinit -->
   141.5 -<screen><prompt>$</prompt> <userinput>cd netplug</userinput>
   141.6 -<prompt>$</prompt> <userinput>hg qinit</userinput>
   141.7 -<prompt>$</prompt> <userinput>hg qnew -m 'fix build problem with gcc 4' build-fix.patch</userinput>
   141.8 -<prompt>$</prompt> <userinput>perl -pi -e 's/int addr_len/socklen_t addr_len/' netlink.c</userinput>
   141.9 -<prompt>$</prompt> <userinput>hg qrefresh</userinput>
  141.10 -<prompt>$</prompt> <userinput>hg tip -p</userinput>
  141.11 -changeset:   
  141.12 -tag:         qtip
  141.13 -tag:         build-fix.patch
  141.14 -tag:         tip
  141.15 -tag:         qbase
  141.16 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  141.17 -
  141.18 -summary:     fix build problem with gcc 4
  141.19 -
  141.20 -diff -r  -r  netlink.c
  141.21 -
  141.22 -
  141.23 -@@ -275,7 +275,7 @@
  141.24 -         exit(1);
  141.25 -     }
  141.26 - 
  141.27 --    int addr_len = sizeof(addr);
  141.28 -+    socklen_t addr_len = sizeof(addr);
  141.29 - 
  141.30 -     if (getsockname(fd, (struct sockaddr *) &amp;addr, &amp;addr_len) == -1) {
  141.31 -         do_log(LOG_ERR, "Could not get socket details: %m");
  141.32 -
  141.33 -</screen>
  141.34 -<!-- END mq.tarball.qinit -->

   142.1 --- a/en/examples/results/mq.tarball.repush.out	Mon Apr 06 23:13:53 2009 -0700
   142.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   142.3 @@ -1,16 +0,0 @@
   142.4 -<!-- BEGIN mq.tarball.repush -->
   142.5 -<screen><prompt>$</prompt> <userinput>cd ../netplug</userinput>
   142.6 -<prompt>$</prompt> <userinput>hg pull ../netplug-1.2.8</userinput>
   142.7 -pulling from ../netplug-1.2.8
   142.8 -searching for changes
   142.9 -adding changesets
  142.10 -adding manifests
  142.11 -adding file changes
  142.12 -added 1 changesets with 12 changes to 12 files
  142.13 -(run 'hg update' to get a working copy)
  142.14 -<prompt>$</prompt> <userinput>hg qpush -a</userinput>
  142.15 -(working directory not at tip)
  142.16 -applying build-fix.patch
  142.17 -now at: build-fix.patch
  142.18 -</screen>
  142.19 -<!-- END mq.tarball.repush -->

   143.1 --- a/en/examples/results/mq.tools.lsdiff.out	Mon Apr 06 23:13:53 2009 -0700
   143.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   143.3 @@ -1,24 +0,0 @@
   143.4 -<!-- BEGIN mq.tools.lsdiff -->
   143.5 -<screen><prompt>$</prompt> <userinput>lsdiff -nvv remove-redundant-null-checks.patch</userinput>
   143.6 -22	File #1  	a/drivers/char/agp/sgi-agp.c
   143.7 -	24	Hunk #1	static int __devinit agp_sgi_init(void)
   143.8 -37	File #2  	a/drivers/char/hvcs.c
   143.9 -	39	Hunk #1	static struct tty_operations hvcs_ops = 
  143.10 -	53	Hunk #2	static int hvcs_alloc_index_list(int n)
  143.11 -69	File #3  	a/drivers/message/fusion/mptfc.c
  143.12 -	71	Hunk #1	mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, in
  143.13 -85	File #4  	a/drivers/message/fusion/mptsas.c
  143.14 -	87	Hunk #1	mptsas_probe_hba_phys(MPT_ADAPTER *ioc)
  143.15 -98	File #5  	a/drivers/net/fs_enet/fs_enet-mii.c
  143.16 -	100	Hunk #1	static struct fs_enet_mii_bus *create_bu
  143.17 -111	File #6  	a/drivers/net/wireless/ipw2200.c
  143.18 -	113	Hunk #1	static struct ipw_fw_error *ipw_alloc_er
  143.19 -	126	Hunk #2	static ssize_t clear_error(struct device
  143.20 -	140	Hunk #3	static void ipw_irq_tasklet(struct ipw_p
  143.21 -	150	Hunk #4	static void ipw_pci_remove(struct pci_de
  143.22 -164	File #7  	a/drivers/scsi/libata-scsi.c
  143.23 -	166	Hunk #1	int ata_cmd_ioctl(struct scsi_device *sc
  143.24 -178	File #8  	a/drivers/video/au1100fb.c
  143.25 -	180	Hunk #1	void __exit au1100fb_cleanup(void)
  143.26 -</screen>
  143.27 -<!-- END mq.tools.lsdiff -->

   144.1 --- a/en/examples/results/mq.tools.tools.out	Mon Apr 06 23:13:53 2009 -0700
   144.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   144.3 @@ -1,26 +0,0 @@
   144.4 -<!-- BEGIN mq.tools.tools -->
   144.5 -<screen><prompt>$</prompt> <userinput>diffstat -p1 remove-redundant-null-checks.patch</userinput>
   144.6 - drivers/char/agp/sgi-agp.c        |    5 ++---
   144.7 - drivers/char/hvcs.c               |   11 +++++------
   144.8 - drivers/message/fusion/mptfc.c    |    6 ++----
   144.9 - drivers/message/fusion/mptsas.c   |    3 +--
  144.10 - drivers/net/fs_enet/fs_enet-mii.c |    3 +--
  144.11 - drivers/net/wireless/ipw2200.c    |   22 ++++++----------------
  144.12 - drivers/scsi/libata-scsi.c        |    4 +---
  144.13 - drivers/video/au1100fb.c          |    3 +--
  144.14 - 8 files changed, 19 insertions(+), 38 deletions(-)
  144.15 -<prompt>$</prompt> <userinput>filterdiff -i '*/video/*' remove-redundant-null-checks.patch</userinput>
  144.16 -
  144.17 -
  144.18 -@@ -743,8 +743,7 @@ void __exit au1100fb_cleanup(void)
  144.19 - {
  144.20 - 	driver_unregister(&amp;au1100fb_driver);
  144.21 - 
  144.22 --	if (drv_info.opt_mode)
  144.23 --		kfree(drv_info.opt_mode);
  144.24 -+	kfree(drv_info.opt_mode);
  144.25 - }
  144.26 - 
  144.27 - module_init(au1100fb_init);
  144.28 -</screen>
  144.29 -<!-- END mq.tools.tools -->

   145.1 --- a/en/examples/results/mq.tutorial.add.out	Mon Apr 06 23:13:53 2009 -0700
   145.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   145.3 @@ -1,7 +0,0 @@
   145.4 -<!-- BEGIN mq.tutorial.add -->
   145.5 -<screen><prompt>$</prompt> <userinput>echo 'file 3, line 1' &gt;&gt; file3</userinput>
   145.6 -<prompt>$</prompt> <userinput>hg qnew add-file3.patch</userinput>
   145.7 -<prompt>$</prompt> <userinput>hg qnew -f add-file3.patch</userinput>
   145.8 -abort: patch "add-file3.patch" already exists
   145.9 -</screen>
  145.10 -<!-- END mq.tutorial.add -->

   146.1 --- a/en/examples/results/mq.tutorial.qinit.out	Mon Apr 06 23:13:53 2009 -0700
   146.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   146.3 @@ -1,10 +0,0 @@
   146.4 -<!-- BEGIN mq.tutorial.qinit -->
   146.5 -<screen><prompt>$</prompt> <userinput>hg init mq-sandbox</userinput>
   146.6 -<prompt>$</prompt> <userinput>cd mq-sandbox</userinput>
   146.7 -<prompt>$</prompt> <userinput>echo 'line 1' &gt; file1</userinput>
   146.8 -<prompt>$</prompt> <userinput>echo 'another line 1' &gt; file2</userinput>
   146.9 -<prompt>$</prompt> <userinput>hg add file1 file2</userinput>
  146.10 -<prompt>$</prompt> <userinput>hg commit -m'first change'</userinput>
  146.11 -<prompt>$</prompt> <userinput>hg qinit</userinput>
  146.12 -</screen>
  146.13 -<!-- END mq.tutorial.qinit -->

   147.1 --- a/en/examples/results/mq.tutorial.qnew.out	Mon Apr 06 23:13:53 2009 -0700
   147.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   147.3 @@ -1,23 +0,0 @@
   147.4 -<!-- BEGIN mq.tutorial.qnew -->
   147.5 -<screen><prompt>$</prompt> <userinput>hg tip</userinput>
   147.6 -changeset:   
   147.7 -tag:         tip
   147.8 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   147.9 -
  147.10 -summary:     first change
  147.11 -
  147.12 -<prompt>$</prompt> <userinput>hg qnew first.patch</userinput>
  147.13 -<prompt>$</prompt> <userinput>hg tip</userinput>
  147.14 -changeset:   
  147.15 -tag:         qtip
  147.16 -tag:         first.patch
  147.17 -tag:         tip
  147.18 -tag:         qbase
  147.19 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  147.20 -
  147.21 -summary:     [mq]: first.patch
  147.22 -
  147.23 -<prompt>$</prompt> <userinput>ls .hg/patches</userinput>
  147.24 -first.patch  series  status
  147.25 -</screen>
  147.26 -<!-- END mq.tutorial.qnew -->

   148.1 --- a/en/examples/results/mq.tutorial.qnew2.out	Mon Apr 06 23:13:53 2009 -0700
   148.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   148.3 @@ -1,31 +0,0 @@
   148.4 -<!-- BEGIN mq.tutorial.qnew2 -->
   148.5 -<screen><prompt>$</prompt> <userinput>hg qnew second.patch</userinput>
   148.6 -<prompt>$</prompt> <userinput>hg log --style=compact --limit=2</userinput>
   148.7 -2[qtip,second.patch,tip]      2009-03-31 19:08 +0000   bos
   148.8 -  [mq]: second.patch
   148.9 -
  148.10 -1[first.patch,qbase]      2009-03-31 19:08 +0000   bos
  148.11 -  [mq]: first.patch
  148.12 -
  148.13 -<prompt>$</prompt> <userinput>echo 'line 4' &gt;&gt; file1</userinput>
  148.14 -<prompt>$</prompt> <userinput>hg qrefresh</userinput>
  148.15 -<prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
  148.16 -2[qtip,second.patch,tip]      2009-03-31 19:08 +0000   bos
  148.17 -  [mq]: second.patch
  148.18 -
  148.19 -diff -r  -r  file1
  148.20 -
  148.21 -
  148.22 -@@ -1,3 +1,4 @@
  148.23 - line 1
  148.24 - line 2
  148.25 - line 3
  148.26 -+line 4
  148.27 -
  148.28 -<prompt>$</prompt> <userinput>hg annotate file1</userinput>
  148.29 -0: line 1
  148.30 -1: line 2
  148.31 -1: line 3
  148.32 -2: line 4
  148.33 -</screen>
  148.34 -<!-- END mq.tutorial.qnew2 -->

   149.1 --- a/en/examples/results/mq.tutorial.qpop.out	Mon Apr 06 23:13:53 2009 -0700
   149.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   149.3 @@ -1,17 +0,0 @@
   149.4 -<!-- BEGIN mq.tutorial.qpop -->
   149.5 -<screen><prompt>$</prompt> <userinput>hg qapplied</userinput>
   149.6 -first.patch
   149.7 -second.patch
   149.8 -<prompt>$</prompt> <userinput>hg qpop</userinput>
   149.9 -now at: first.patch
  149.10 -<prompt>$</prompt> <userinput>hg qseries</userinput>
  149.11 -first.patch
  149.12 -second.patch
  149.13 -<prompt>$</prompt> <userinput>hg qapplied</userinput>
  149.14 -first.patch
  149.15 -<prompt>$</prompt> <userinput>cat file1</userinput>
  149.16 -line 1
  149.17 -line 2
  149.18 -line 3
  149.19 -</screen>
  149.20 -<!-- END mq.tutorial.qpop -->

   150.1 --- a/en/examples/results/mq.tutorial.qpush-a.out	Mon Apr 06 23:13:53 2009 -0700
   150.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   150.3 @@ -1,11 +0,0 @@
   150.4 -<!-- BEGIN mq.tutorial.qpush-a -->
   150.5 -<screen><prompt>$</prompt> <userinput>hg qpush -a</userinput>
   150.6 -applying second.patch
   150.7 -now at: second.patch
   150.8 -<prompt>$</prompt> <userinput>cat file1</userinput>
   150.9 -line 1
  150.10 -line 2
  150.11 -line 3
  150.12 -line 4
  150.13 -</screen>
  150.14 -<!-- END mq.tutorial.qpush-a -->

   151.1 --- a/en/examples/results/mq.tutorial.qrefresh.out	Mon Apr 06 23:13:53 2009 -0700
   151.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   151.3 @@ -1,24 +0,0 @@
   151.4 -<!-- BEGIN mq.tutorial.qrefresh -->
   151.5 -<screen><prompt>$</prompt> <userinput>echo 'line 2' &gt;&gt; file1</userinput>
   151.6 -<prompt>$</prompt> <userinput>hg diff</userinput>
   151.7 -diff -r  file1
   151.8 -
   151.9 -
  151.10 -@@ -1,1 +1,2 @@
  151.11 - line 1
  151.12 -+line 2
  151.13 -<prompt>$</prompt> <userinput>hg qrefresh</userinput>
  151.14 -<prompt>$</prompt> <userinput>hg diff</userinput>
  151.15 -<prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
  151.16 -1[qtip,first.patch,tip,qbase]      2009-03-31 19:08 +0000   bos
  151.17 -  [mq]: first.patch
  151.18 -
  151.19 -diff -r  -r  file1
  151.20 -
  151.21 -
  151.22 -@@ -1,1 +1,2 @@
  151.23 - line 1
  151.24 -+line 2
  151.25 -
  151.26 -</screen>
  151.27 -<!-- END mq.tutorial.qrefresh -->

   152.1 --- a/en/examples/results/mq.tutorial.qrefresh2.out	Mon Apr 06 23:13:53 2009 -0700
   152.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   152.3 @@ -1,19 +0,0 @@
   152.4 -<!-- BEGIN mq.tutorial.qrefresh2 -->
   152.5 -<screen><prompt>$</prompt> <userinput>echo 'line 3' &gt;&gt; file1</userinput>
   152.6 -<prompt>$</prompt> <userinput>hg status</userinput>
   152.7 -M file1
   152.8 -<prompt>$</prompt> <userinput>hg qrefresh</userinput>
   152.9 -<prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
  152.10 -1[qtip,first.patch,tip,qbase]      2009-03-31 19:08 +0000   bos
  152.11 -  [mq]: first.patch
  152.12 -
  152.13 -diff -r  -r  file1
  152.14 -
  152.15 -
  152.16 -@@ -1,1 +1,3 @@
  152.17 - line 1
  152.18 -+line 2
  152.19 -+line 3
  152.20 -
  152.21 -</screen>
  152.22 -<!-- END mq.tutorial.qrefresh2 -->

   153.1 --- a/en/examples/results/mq.tutorial.qseries.out	Mon Apr 06 23:13:53 2009 -0700
   153.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   153.3 @@ -1,9 +0,0 @@
   153.4 -<!-- BEGIN mq.tutorial.qseries -->
   153.5 -<screen><prompt>$</prompt> <userinput>hg qseries</userinput>
   153.6 -first.patch
   153.7 -second.patch
   153.8 -<prompt>$</prompt> <userinput>hg qapplied</userinput>
   153.9 -first.patch
  153.10 -second.patch
  153.11 -</screen>
  153.12 -<!-- END mq.tutorial.qseries -->

   154.1 --- a/en/examples/results/rename.divergent.clone.out	Mon Apr 06 23:13:53 2009 -0700
   154.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   154.3 @@ -1,9 +0,0 @@
   154.4 -<!-- BEGIN rename.divergent.clone -->
   154.5 -<screen><prompt>$</prompt> <userinput>hg clone orig anne</userinput>
   154.6 -updating working directory
   154.7 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   154.8 -<prompt>$</prompt> <userinput>hg clone orig bob</userinput>
   154.9 -updating working directory
  154.10 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  154.11 -</screen>
  154.12 -<!-- END rename.divergent.clone -->

   155.1 --- a/en/examples/results/rename.divergent.merge.out	Mon Apr 06 23:13:53 2009 -0700
   155.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   155.3 @@ -1,29 +0,0 @@
   155.4 -<!-- BEGIN rename.divergent.merge -->
   155.5 -<screen># See http://www.selenic.com/mercurial/bts/issue455
   155.6 -<prompt>$</prompt> <userinput>cd ../orig</userinput>
   155.7 -<prompt>$</prompt> <userinput>hg pull -u ../anne</userinput>
   155.8 -pulling from ../anne
   155.9 -searching for changes
  155.10 -adding changesets
  155.11 -adding manifests
  155.12 -adding file changes
  155.13 -added 1 changesets with 1 changes to 1 files
  155.14 -1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  155.15 -<prompt>$</prompt> <userinput>hg pull ../bob</userinput>
  155.16 -pulling from ../bob
  155.17 -searching for changes
  155.18 -adding changesets
  155.19 -adding manifests
  155.20 -adding file changes
  155.21 -added 1 changesets with 1 changes to 1 files (+1 heads)
  155.22 -(run 'hg heads' to see heads, 'hg merge' to merge)
  155.23 -<prompt>$</prompt> <userinput>hg merge</userinput>
  155.24 -warning: detected divergent renames of foo to:
  155.25 - bar
  155.26 - quux
  155.27 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  155.28 -(branch merge, don't forget to commit)
  155.29 -<prompt>$</prompt> <userinput>ls</userinput>
  155.30 -bar  quux
  155.31 -</screen>
  155.32 -<!-- END rename.divergent.merge -->

   156.1 --- a/en/examples/results/rename.divergent.rename.anne.out	Mon Apr 06 23:13:53 2009 -0700
   156.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   156.3 @@ -1,6 +0,0 @@
   156.4 -<!-- BEGIN rename.divergent.rename.anne -->
   156.5 -<screen><prompt>$</prompt> <userinput>cd anne</userinput>
   156.6 -<prompt>$</prompt> <userinput>hg mv foo bar</userinput>
   156.7 -<prompt>$</prompt> <userinput>hg ci -m 'Rename foo to bar'</userinput>
   156.8 -</screen>
   156.9 -<!-- END rename.divergent.rename.anne -->

   157.1 --- a/en/examples/results/rename.divergent.rename.bob.out	Mon Apr 06 23:13:53 2009 -0700
   157.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   157.3 @@ -1,6 +0,0 @@
   157.4 -<!-- BEGIN rename.divergent.rename.bob -->
   157.5 -<screen><prompt>$</prompt> <userinput>cd ../bob</userinput>
   157.6 -<prompt>$</prompt> <userinput>hg mv foo quux</userinput>
   157.7 -<prompt>$</prompt> <userinput>hg ci -m 'Rename foo to quux'</userinput>
   157.8 -</screen>
   157.9 -<!-- END rename.divergent.rename.bob -->

   158.1 --- a/en/examples/results/rollback.add.out	Mon Apr 06 23:13:53 2009 -0700
   158.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   158.3 @@ -1,5 +0,0 @@
   158.4 -<!-- BEGIN rollback.add -->
   158.5 -<screen><prompt>$</prompt> <userinput>hg add b</userinput>
   158.6 -<prompt>$</prompt> <userinput>hg commit -m 'Add file b, this time for real'</userinput>
   158.7 -</screen>
   158.8 -<!-- END rollback.add -->

   159.1 --- a/en/examples/results/rollback.commit.out	Mon Apr 06 23:13:53 2009 -0700
   159.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   159.3 @@ -1,7 +0,0 @@
   159.4 -<!-- BEGIN rollback.commit -->
   159.5 -<screen><prompt>$</prompt> <userinput>hg status</userinput>
   159.6 -M a
   159.7 -<prompt>$</prompt> <userinput>echo b &gt; b</userinput>
   159.8 -<prompt>$</prompt> <userinput>hg commit -m 'Add file b'</userinput>
   159.9 -</screen>
  159.10 -<!-- END rollback.commit -->

   160.1 --- a/en/examples/results/rollback.rollback.out	Mon Apr 06 23:13:53 2009 -0700
   160.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   160.3 @@ -1,15 +0,0 @@
   160.4 -<!-- BEGIN rollback.rollback -->
   160.5 -<screen><prompt>$</prompt> <userinput>hg rollback</userinput>
   160.6 -rolling back last transaction
   160.7 -<prompt>$</prompt> <userinput>hg tip</userinput>
   160.8 -changeset:   
   160.9 -tag:         tip
  160.10 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  160.11 -
  160.12 -summary:     First commit
  160.13 -
  160.14 -<prompt>$</prompt> <userinput>hg status</userinput>
  160.15 -M a
  160.16 -? b
  160.17 -</screen>
  160.18 -<!-- END rollback.rollback -->

   161.1 --- a/en/examples/results/rollback.status.out	Mon Apr 06 23:13:53 2009 -0700
   161.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   161.3 @@ -1,12 +0,0 @@
   161.4 -<!-- BEGIN rollback.status -->
   161.5 -<screen><prompt>$</prompt> <userinput>hg status</userinput>
   161.6 -? b
   161.7 -<prompt>$</prompt> <userinput>hg tip</userinput>
   161.8 -changeset:   
   161.9 -tag:         tip
  161.10 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  161.11 -
  161.12 -summary:     Add file b
  161.13 -
  161.14 -</screen>
  161.15 -<!-- END rollback.status -->

   162.1 --- a/en/examples/results/rollback.tip.out	Mon Apr 06 23:13:53 2009 -0700
   162.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   162.3 @@ -1,3 +0,0 @@
   162.4 -<!-- BEGIN rollback.tip -->
   162.5 -<screen></screen>
   162.6 -<!-- END rollback.tip -->

   163.1 --- a/en/examples/results/rollback.twice.out	Mon Apr 06 23:13:53 2009 -0700
   163.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   163.3 @@ -1,7 +0,0 @@
   163.4 -<!-- BEGIN rollback.twice -->
   163.5 -<screen><prompt>$</prompt> <userinput>hg rollback</userinput>
   163.6 -rolling back last transaction
   163.7 -<prompt>$</prompt> <userinput>hg rollback</userinput>
   163.8 -no rollback information available
   163.9 -</screen>
  163.10 -<!-- END rollback.twice -->

   164.1 --- a/en/examples/results/tag.init.out	Mon Apr 06 23:13:53 2009 -0700
   164.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   164.3 @@ -1,8 +0,0 @@
   164.4 -<!-- BEGIN tag.init -->
   164.5 -<screen><prompt>$</prompt> <userinput>hg init mytag</userinput>
   164.6 -<prompt>$</prompt> <userinput>cd mytag</userinput>
   164.7 -<prompt>$</prompt> <userinput>echo hello &gt; myfile</userinput>
   164.8 -<prompt>$</prompt> <userinput>hg commit -A -m 'Initial commit'</userinput>
   164.9 -adding myfile
  164.10 -</screen>
  164.11 -<!-- END tag.init -->

   165.1 --- a/en/examples/results/tag.log.out	Mon Apr 06 23:13:53 2009 -0700
   165.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   165.3 @@ -1,16 +0,0 @@
   165.4 -<!-- BEGIN tag.log -->
   165.5 -<screen><prompt>$</prompt> <userinput>hg log</userinput>
   165.6 -changeset:   
   165.7 -tag:         tip
   165.8 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   165.9 -
  165.10 -summary:     Added tag v1.0 for changeset 
  165.11 -
  165.12 -changeset:   
  165.13 -tag:         v1.0
  165.14 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  165.15 -
  165.16 -summary:     Initial commit
  165.17 -
  165.18 -</screen>
  165.19 -<!-- END tag.log -->

   166.1 --- a/en/examples/results/tag.log.v1.0.out	Mon Apr 06 23:13:53 2009 -0700
   166.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   166.3 @@ -1,13 +0,0 @@
   166.4 -<!-- BEGIN tag.log.v1.0 -->
   166.5 -<screen><prompt>$</prompt> <userinput>echo goodbye &gt; myfile2</userinput>
   166.6 -<prompt>$</prompt> <userinput>hg commit -A -m 'Second commit'</userinput>
   166.7 -adding myfile2
   166.8 -<prompt>$</prompt> <userinput>hg log -r v1.0</userinput>
   166.9 -changeset:   
  166.10 -tag:         v1.0
  166.11 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  166.12 -
  166.13 -summary:     Initial commit
  166.14 -
  166.15 -</screen>
  166.16 -<!-- END tag.log.v1.0 -->

   167.1 --- a/en/examples/results/tag.remove.out	Mon Apr 06 23:13:53 2009 -0700
   167.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   167.3 @@ -1,6 +0,0 @@
   167.4 -<!-- BEGIN tag.remove -->
   167.5 -<screen><prompt>$</prompt> <userinput>hg tag --remove v1.0</userinput>
   167.6 -<prompt>$</prompt> <userinput>hg tags</userinput>
   167.7 -tip                                
   167.8 -</screen>
   167.9 -<!-- END tag.remove -->

   168.1 --- a/en/examples/results/tag.replace.out	Mon Apr 06 23:13:53 2009 -0700
   168.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   168.3 @@ -1,13 +0,0 @@
   168.4 -<!-- BEGIN tag.replace -->
   168.5 -<screen><prompt>$</prompt> <userinput>hg tag -r 1 v1.1</userinput>
   168.6 -<prompt>$</prompt> <userinput>hg tags</userinput>
   168.7 -tip                                
   168.8 -v1.1                               
   168.9 -<prompt>$</prompt> <userinput>hg tag -r 2 v1.1</userinput>
  168.10 -abort: tag 'v1.1' already exists (use -f to force)
  168.11 -<prompt>$</prompt> <userinput>hg tag -f -r 2 v1.1</userinput>
  168.12 -<prompt>$</prompt> <userinput>hg tags</userinput>
  168.13 -tip                                
  168.14 -v1.1                               
  168.15 -</screen>
  168.16 -<!-- END tag.replace -->

   169.1 --- a/en/examples/results/tag.tag.out	Mon Apr 06 23:13:53 2009 -0700
   169.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   169.3 @@ -1,4 +0,0 @@
   169.4 -<!-- BEGIN tag.tag -->
   169.5 -<screen><prompt>$</prompt> <userinput>hg tag v1.0</userinput>
   169.6 -</screen>
   169.7 -<!-- END tag.tag -->

   170.1 --- a/en/examples/results/tag.tags.out	Mon Apr 06 23:13:53 2009 -0700
   170.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   170.3 @@ -1,6 +0,0 @@
   170.4 -<!-- BEGIN tag.tags -->
   170.5 -<screen><prompt>$</prompt> <userinput>hg tags</userinput>
   170.6 -tip                                
   170.7 -v1.0                               
   170.8 -</screen>
   170.9 -<!-- END tag.tags -->

   171.1 --- a/en/examples/results/tag.tip.out	Mon Apr 06 23:13:53 2009 -0700
   171.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   171.3 @@ -1,10 +0,0 @@
   171.4 -<!-- BEGIN tag.tip -->
   171.5 -<screen><prompt>$</prompt> <userinput>hg tip</userinput>
   171.6 -changeset:   
   171.7 -tag:         tip
   171.8 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
   171.9 -
  171.10 -summary:     Added tag v1.1 for changeset 
  171.11 -
  171.12 -</screen>
  171.13 -<!-- END tag.tip -->

   172.1 --- a/en/examples/results/template.simple.changelog.out	Mon Apr 06 23:13:53 2009 -0700
   172.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   172.3 @@ -1,25 +0,0 @@
   172.4 -
   172.5 -
   172.6 -
   172.7 -
   172.8 -
   172.9 -
  172.10 -
  172.11 -
  172.12 -
  172.13 -
  172.14 -
  172.15 -
  172.16 -
  172.17 -
  172.18 -
  172.19 -
  172.20 -
  172.21 -
  172.22 -
  172.23 -
  172.24 -
  172.25 -
  172.26 -
  172.27 -
  172.28 -

   173.1 --- a/en/examples/results/template.simple.combine.out	Mon Apr 06 23:13:53 2009 -0700
   173.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   173.3 @@ -1,9 +0,0 @@
   173.4 -
   173.5 -
   173.6 -
   173.7 -
   173.8 -
   173.9 -
  173.10 -
  173.11 -
  173.12 -

   174.1 --- a/en/examples/results/template.simple.compact.out	Mon Apr 06 23:13:53 2009 -0700
   174.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   174.3 @@ -1,16 +0,0 @@
   174.4 -
   174.5 -
   174.6 -
   174.7 -
   174.8 -
   174.9 -
  174.10 -
  174.11 -
  174.12 -
  174.13 -
  174.14 -
  174.15 -
  174.16 -
  174.17 -
  174.18 -
  174.19 -

   175.1 --- a/en/examples/results/template.simple.datekeyword.out	Mon Apr 06 23:13:53 2009 -0700
   175.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   175.3 @@ -1,7 +0,0 @@
   175.4 -
   175.5 -
   175.6 -
   175.7 -
   175.8 -
   175.9 -
  175.10 -

   176.1 --- a/en/examples/results/template.simple.keywords.out	Mon Apr 06 23:13:53 2009 -0700
   176.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   176.3 @@ -1,24 +0,0 @@
   176.4 -
   176.5 -
   176.6 -
   176.7 -
   176.8 -
   176.9 -
  176.10 -
  176.11 -
  176.12 -
  176.13 -
  176.14 -
  176.15 -
  176.16 -
  176.17 -
  176.18 -
  176.19 -
  176.20 -
  176.21 -
  176.22 -
  176.23 -
  176.24 -
  176.25 -
  176.26 -
  176.27 -

   177.1 --- a/en/examples/results/template.simple.manyfilters.out	Mon Apr 06 23:13:53 2009 -0700
   177.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   177.3 @@ -1,65 +0,0 @@
   177.4 -
   177.5 -
   177.6 -
   177.7 -
   177.8 -
   177.9 -
  177.10 -
  177.11 -
  177.12 -
  177.13 -
  177.14 -
  177.15 -
  177.16 -
  177.17 -
  177.18 -
  177.19 -
  177.20 -
  177.21 -
  177.22 -
  177.23 -
  177.24 -
  177.25 -
  177.26 -
  177.27 -
  177.28 -
  177.29 -
  177.30 -
  177.31 -
  177.32 -
  177.33 -
  177.34 -
  177.35 -
  177.36 -
  177.37 -
  177.38 -
  177.39 -
  177.40 -
  177.41 -
  177.42 -
  177.43 -
  177.44 -
  177.45 -
  177.46 -
  177.47 -
  177.48 -
  177.49 -
  177.50 -
  177.51 -
  177.52 -
  177.53 -
  177.54 -
  177.55 -
  177.56 -
  177.57 -
  177.58 -
  177.59 -
  177.60 -
  177.61 -
  177.62 -
  177.63 -
  177.64 -
  177.65 -
  177.66 -
  177.67 -
  177.68 -

   178.1 --- a/en/examples/results/template.simple.normal.out	Mon Apr 06 23:13:53 2009 -0700
   178.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   178.3 @@ -1,10 +0,0 @@
   178.4 -
   178.5 -
   178.6 -
   178.7 -
   178.8 -
   178.9 -
  178.10 -
  178.11 -
  178.12 -
  178.13 -

   179.1 --- a/en/examples/results/template.simple.rev.out	Mon Apr 06 23:13:53 2009 -0700
   179.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   179.3 @@ -1,6 +0,0 @@
   179.4 -
   179.5 -
   179.6 -
   179.7 -
   179.8 -
   179.9 -

   180.1 --- a/en/examples/results/template.simple.simplest.out	Mon Apr 06 23:13:53 2009 -0700
   180.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   180.3 @@ -1,5 +0,0 @@
   180.4 -
   180.5 -
   180.6 -
   180.7 -
   180.8 -

   181.1 --- a/en/examples/results/template.simple.simplesub.out	Mon Apr 06 23:13:53 2009 -0700
   181.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   181.3 @@ -1,10 +0,0 @@
   181.4 -
   181.5 -
   181.6 -
   181.7 -
   181.8 -
   181.9 -
  181.10 -
  181.11 -
  181.12 -
  181.13 -

   182.1 --- a/en/examples/results/template.svnstyle.id.out	Mon Apr 06 23:13:53 2009 -0700
   182.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   182.3 @@ -1,4 +0,0 @@
   182.4 -<!-- BEGIN template.svnstyle.id -->
   182.5 -<screen><prompt>$</prompt> <userinput>hg log -r0 --template '{node}'</userinput>
   182.6 -</screen>
   182.7 -<!-- END template.svnstyle.id -->

   183.1 --- a/en/examples/results/template.svnstyle.result.out	Mon Apr 06 23:13:53 2009 -0700
   183.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   183.3 @@ -1,14 +0,0 @@
   183.4 -<!-- BEGIN template.svnstyle.result -->
   183.5 -<screen><prompt>$</prompt> <userinput>hg log -r1 --style svn.style</userinput>
   183.6 -------------------------------------------------------------------------
   183.7 -
   183.8 -r1 | bos | 
   183.9 -
  183.10 -added line to end of &lt;&lt;hello&gt;&gt; file.
  183.11 -
  183.12 -in addition, added a file with the helpful name (at least i hope that some
  183.13 -might consider it so) of goodbye.
  183.14 -
  183.15 -------------------------------------------------------------------------
  183.16 -</screen>
  183.17 -<!-- END template.svnstyle.result -->

   184.1 --- a/en/examples/results/template.svnstyle.short.out	Mon Apr 06 23:13:53 2009 -0700
   184.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   184.3 @@ -1,13 +0,0 @@
   184.4 -<!-- BEGIN template.svnstyle.short -->
   184.5 -<screen><prompt>$</prompt> <userinput>svn log -r9653</userinput>
   184.6 -------------------------------------------------------------------------
   184.7 -r9653 | sean.hefty | 2006-09-27 14:39:55 -0700 (Wed, 27 Sep 2006) | 5 lines
   184.8 -
   184.9 -On reporting a route error, also include the status for the error,
  184.10 -rather than indicating a status of 0 when an error has occurred.
  184.11 -
  184.12 -Signed-off-by: Sean Hefty &lt;sean.hefty@intel.com&gt;
  184.13 -
  184.14 -------------------------------------------------------------------------
  184.15 -</screen>
  184.16 -<!-- END template.svnstyle.short -->

   185.1 --- a/en/examples/results/template.svnstyle.simplest.out	Mon Apr 06 23:13:53 2009 -0700
   185.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   185.3 @@ -1,7 +0,0 @@
   185.4 -<!-- BEGIN template.svnstyle.simplest -->
   185.5 -<screen><prompt>$</prompt> <userinput>cat svn.style</userinput>
   185.6 -changeset = "{node|short}\n"
   185.7 -<prompt>$</prompt> <userinput>hg log -r1 --style svn.style</userinput>
   185.8 -
   185.9 -</screen>
  185.10 -<!-- END template.svnstyle.simplest -->

   186.1 --- a/en/examples/results/template.svnstyle.style.out	Mon Apr 06 23:13:53 2009 -0700
   186.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   186.3 @@ -1,6 +0,0 @@
   186.4 -<!-- BEGIN template.svnstyle.style -->
   186.5 -<screen><prompt>$</prompt> <userinput>cat svn.style</userinput>
   186.6 -header = '------------------------------------------------------------------------\n\n'
   186.7 -changeset = svn.template
   186.8 -</screen>
   186.9 -<!-- END template.svnstyle.style -->

   187.1 --- a/en/examples/results/template.svnstyle.syntax.error.out	Mon Apr 06 23:13:53 2009 -0700
   187.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   187.3 @@ -1,5 +0,0 @@
   187.4 -<!-- BEGIN template.svnstyle.syntax.error -->
   187.5 -<screen><prompt>$</prompt> <userinput>hg log -r1 --style broken.style</userinput>
   187.6 -abort: broken.style:1: parse error
   187.7 -</screen>
   187.8 -<!-- END template.svnstyle.syntax.error -->

   188.1 --- a/en/examples/results/template.svnstyle.syntax.input.out	Mon Apr 06 23:13:53 2009 -0700
   188.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   188.3 @@ -1,5 +0,0 @@
   188.4 -<!-- BEGIN template.svnstyle.syntax.input -->
   188.5 -<screen><prompt>$</prompt> <userinput>cat broken.style</userinput>
   188.6 -changeset =
   188.7 -</screen>
   188.8 -<!-- END template.svnstyle.syntax.input -->

   189.1 --- a/en/examples/results/template.svnstyle.template.out	Mon Apr 06 23:13:53 2009 -0700
   189.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   189.3 @@ -1,9 +0,0 @@
   189.4 -<!-- BEGIN template.svnstyle.template -->
   189.5 -<screen><prompt>$</prompt> <userinput>cat svn.template</userinput>
   189.6 -r{rev} | {author|user} | {date|isodate} ({date|rfc822date})
   189.7 -
   189.8 -{desc|strip|fill76}
   189.9 -
  189.10 -------------------------------------------------------------------------
  189.11 -</screen>
  189.12 -<!-- END template.svnstyle.template -->

   190.1 --- a/en/examples/results/tour-merge-conflict.commit.out	Mon Apr 06 23:13:53 2009 -0700
   190.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   190.3 @@ -1,19 +0,0 @@
   190.4 -<!-- BEGIN tour-merge-conflict.commit -->
   190.5 -<screen><prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
   190.6 -<prompt>></prompt> <userinput>Greetings!</userinput>
   190.7 -<prompt>></prompt> <userinput>I am Bryan O'Sullivan, no relation of the former</userinput>
   190.8 -<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
   190.9 -<prompt>></prompt> <userinput>EOF</userinput>
  190.10 -<prompt>$</prompt> <userinput>hg resolve -m letter.txt</userinput>
  190.11 -<prompt>$</prompt> <userinput>hg commit -m 'Send me your money'</userinput>
  190.12 -<prompt>$</prompt> <userinput>hg tip</userinput>
  190.13 -changeset:   
  190.14 -tag:         tip
  190.15 -parent:      
  190.16 -parent:      
  190.17 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
  190.18 -
  190.19 -summary:     Send me your money
  190.20 -
  190.21 -</screen>
  190.22 -<!-- END tour-merge-conflict.commit -->

   191.1 --- a/en/examples/results/tour-merge-conflict.cousin.out	Mon Apr 06 23:13:53 2009 -0700
   191.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   191.3 @@ -1,14 +0,0 @@
   191.4 -<!-- BEGIN tour-merge-conflict.cousin -->
   191.5 -<screen><prompt>$</prompt> <userinput>cd ..</userinput>
   191.6 -<prompt>$</prompt> <userinput>hg clone scam scam-cousin</userinput>
   191.7 -updating working directory
   191.8 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   191.9 -<prompt>$</prompt> <userinput>cd scam-cousin</userinput>
  191.10 -<prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
  191.11 -<prompt>></prompt> <userinput>Greetings!</userinput>
  191.12 -<prompt>></prompt> <userinput>I am Shehu Musa Abacha, cousin to the former</userinput>
  191.13 -<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
  191.14 -<prompt>></prompt> <userinput>EOF</userinput>
  191.15 -<prompt>$</prompt> <userinput>hg commit -m '419 scam, with cousin'</userinput>
  191.16 -</screen>
  191.17 -<!-- END tour-merge-conflict.cousin -->

   192.1 --- a/en/examples/results/tour-merge-conflict.merge.out	Mon Apr 06 23:13:53 2009 -0700
   192.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   192.3 @@ -1,20 +0,0 @@
   192.4 -<!-- BEGIN tour-merge-conflict.merge -->
   192.5 -<screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput>
   192.6 -<prompt>$</prompt> <userinput>echo 'XXX this is broken and must be fixed'</userinput>
   192.7 -XXX this is broken and must be fixed
   192.8 -<prompt>$</prompt> <userinput>hg merge</userinput>
   192.9 -merging letter.txt
  192.10 -merge: warning: conflicts during merge
  192.11 -merging letter.txt failed!
  192.12 -0 files updated, 0 files merged, 0 files removed, 1 files unresolved
  192.13 -use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
  192.14 -<prompt>$</prompt> <userinput>cat letter.txt</userinput>
  192.15 -Greetings!
  192.16 -&lt;&lt;&lt;&lt;&lt;&lt;&lt; /tmp/tour-merge-conflictP17yO-/scam-merge/letter.txt
  192.17 -I am Shehu Musa Abacha, cousin to the former
  192.18 -=======
  192.19 -I am Alhaji Abba Abacha, son of the former
  192.20 -&gt;&gt;&gt;&gt;&gt;&gt;&gt; /tmp/letter.txt~other.EVdwH3
  192.21 -Nigerian dictator Sani Abacha.
  192.22 -</screen>
  192.23 -<!-- END tour-merge-conflict.merge -->

   193.1 --- a/en/examples/results/tour-merge-conflict.pull.out	Mon Apr 06 23:13:53 2009 -0700
   193.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   193.3 @@ -1,17 +0,0 @@
   193.4 -<!-- BEGIN tour-merge-conflict.pull -->
   193.5 -<screen><prompt>$</prompt> <userinput>cd ..</userinput>
   193.6 -<prompt>$</prompt> <userinput>hg clone scam-cousin scam-merge</userinput>
   193.7 -updating working directory
   193.8 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   193.9 -<prompt>$</prompt> <userinput>cd scam-merge</userinput>
  193.10 -<prompt>$</prompt> <userinput>hg pull -u ../scam-son</userinput>
  193.11 -pulling from ../scam-son
  193.12 -searching for changes
  193.13 -adding changesets
  193.14 -adding manifests
  193.15 -adding file changes
  193.16 -added 1 changesets with 1 changes to 1 files (+1 heads)
  193.17 -not updating, since new heads added
  193.18 -(run 'hg heads' to see heads, 'hg merge' to merge)
  193.19 -</screen>
  193.20 -<!-- END tour-merge-conflict.pull -->