Mercurial > hgbook
changeset 397:2b8c6aa370d5
Fix sample output for test 'branch-repo'.
| author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
|---|---|
| date | Wed, 20 Aug 2008 21:54:18 +0200 |
| 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 |
| diffstat | 4 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/en/examples/branch-repo.bugfix.out Wed Aug 20 21:53:01 2008 +0200 +++ b/en/examples/branch-repo.bugfix.out Wed Aug 20 21:54:18 2008 +0200 @@ -1,4 +1,5 @@ $ \textbf{hg clone myproject-1.0.1 my-1.0.1-bugfix} +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ \textbf{cd my-1.0.1-bugfix} $ \textbf{echo 'I fixed a bug using only echo!' >> myfile}
--- a/en/examples/branch-repo.clone.out Wed Aug 20 21:53:01 2008 +0200 +++ b/en/examples/branch-repo.clone.out Wed Aug 20 21:54:18 2008 +0200 @@ -1,3 +1,4 @@ $ \textbf{cd ..} $ \textbf{hg clone myproject myproject-1.0.1} +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/branch-repo.new.out Wed Aug 20 21:53:01 2008 +0200 +++ b/en/examples/branch-repo.new.out Wed Aug 20 21:54:18 2008 +0200 @@ -1,5 +1,6 @@ $ \textbf{cd ..} $ \textbf{hg clone myproject my-feature} +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ \textbf{cd my-feature} $ \textbf{echo 'This sure is an exciting new feature!' > mynewfile}
--- a/en/examples/branch-repo.pull.out Wed Aug 20 21:53:01 2008 +0200 +++ b/en/examples/branch-repo.pull.out Wed Aug 20 21:54:18 2008 +0200 @@ -1,5 +1,6 @@ $ \textbf{cd ..} $ \textbf{hg clone myproject myproject-merge} +updating working directory 3 files updated, 0 files merged, 0 files removed, 0 files unresolved $ \textbf{cd myproject-merge} $ \textbf{hg pull ../myproject-1.0.1}