Mercurial > hgbook
changeset 642:51b5d56744c5
Merge Spanish version
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu, 29 Jan 2009 22:00:07 -0800 |
parents | 73b094b764ec (diff) b35930ce7a70 (current diff) |
children | f5ab40759789 |
files | en/examples/bisect |
diffstat | 2 files changed, 6 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/en/examples/bisect Thu Jan 29 23:20:01 2009 -0500 +++ b/en/examples/bisect Thu Jan 29 22:00:07 2009 -0800 @@ -37,19 +37,15 @@ #$ name: search.init -if hg -v | head -1 | grep -e "version 0.*" -then -#On mercurial 1.0 --init disappeared -hg bisect --init -fi +hg bisect init #$ name: search.bad-init -hg bisect --bad +hg bisect bad #$ name: search.good-init -hg bisect --good 10 +hg bisect good 10 #$ name: search.step1 @@ -74,7 +70,7 @@ fi echo this revision is $result - hg bisect --$result + hg bisect $result } #$ name: search.step2 @@ -89,7 +85,7 @@ #$ name: search.reset -hg bisect --reset +hg bisect reset #$ name:
--- a/en/undo.tex Thu Jan 29 23:20:01 2009 -0500 +++ b/en/undo.tex Thu Jan 29 22:00:07 2009 -0800 @@ -553,7 +553,7 @@ The \hgcmd{bisect} command is aware of the ``branchy'' nature of a Mercurial project's revision history, so it has no problems dealing -with branches, merges, or multiple heads in a repoository. It can +with branches, merges, or multiple heads in a repository. It can prune entire branches of history with a single probe, which is how it operates so efficiently.