hgbook
changeset 298:2b8c6aa370d5
Fix sample output for test 'branch-repo'.
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed Aug 20 21:54:18 2008 +0200 (2008-08-20) |
parents | bd8d96d3703d |
children | 2936cb7eae7a |
files | en/examples/branch-repo.bugfix.out en/examples/branch-repo.clone.out en/examples/branch-repo.new.out en/examples/branch-repo.pull.out |
line diff
1.1 --- a/en/examples/branch-repo.bugfix.out Wed Aug 20 21:53:01 2008 +0200 1.2 +++ b/en/examples/branch-repo.bugfix.out Wed Aug 20 21:54:18 2008 +0200 1.3 @@ -1,4 +1,5 @@ 1.4 $ \textbf{hg clone myproject-1.0.1 my-1.0.1-bugfix} 1.5 +updating working directory 1.6 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.7 $ \textbf{cd my-1.0.1-bugfix} 1.8 $ \textbf{echo 'I fixed a bug using only echo!' >> myfile}
2.1 --- a/en/examples/branch-repo.clone.out Wed Aug 20 21:53:01 2008 +0200 2.2 +++ b/en/examples/branch-repo.clone.out Wed Aug 20 21:54:18 2008 +0200 2.3 @@ -1,3 +1,4 @@ 2.4 $ \textbf{cd ..} 2.5 $ \textbf{hg clone myproject myproject-1.0.1} 2.6 +updating working directory 2.7 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3.1 --- a/en/examples/branch-repo.new.out Wed Aug 20 21:53:01 2008 +0200 3.2 +++ b/en/examples/branch-repo.new.out Wed Aug 20 21:54:18 2008 +0200 3.3 @@ -1,5 +1,6 @@ 3.4 $ \textbf{cd ..} 3.5 $ \textbf{hg clone myproject my-feature} 3.6 +updating working directory 3.7 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 3.8 $ \textbf{cd my-feature} 3.9 $ \textbf{echo 'This sure is an exciting new feature!' > mynewfile}
4.1 --- a/en/examples/branch-repo.pull.out Wed Aug 20 21:53:01 2008 +0200 4.2 +++ b/en/examples/branch-repo.pull.out Wed Aug 20 21:54:18 2008 +0200 4.3 @@ -1,5 +1,6 @@ 4.4 $ \textbf{cd ..} 4.5 $ \textbf{hg clone myproject myproject-merge} 4.6 +updating working directory 4.7 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 4.8 $ \textbf{cd myproject-merge} 4.9 $ \textbf{hg pull ../myproject-1.0.1}