# HG changeset patch # User Guido Ostkamp # Date 1219262058 -7200 # Node ID 2b8c6aa370d5ef2a427834526ccbe26f465cac63 # Parent bd8d96d3703d1b5db9dfecf94b76fb4c2bca08a1 Fix sample output for test 'branch-repo'. diff -r bd8d96d3703d -r 2b8c6aa370d5 en/examples/branch-repo.bugfix.out --- 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} diff -r bd8d96d3703d -r 2b8c6aa370d5 en/examples/branch-repo.clone.out --- 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 diff -r bd8d96d3703d -r 2b8c6aa370d5 en/examples/branch-repo.new.out --- 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} diff -r bd8d96d3703d -r 2b8c6aa370d5 en/examples/branch-repo.pull.out --- 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}