Mercurial > hgbook
changeset 398:2936cb7eae7a
Fix sample output for test 'branch-named'.
| author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
|---|---|
| date | Wed, 20 Aug 2008 21:55:35 +0200 |
| parents | 2b8c6aa370d5 |
| children | b0d1aec44945 |
| files | en/examples/branch-named en/examples/branch-named.foo-commit.out en/examples/branch-named.merge.out en/examples/branch-named.update-bar.out |
| diffstat | 4 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/en/examples/branch-named Wed Aug 20 21:54:18 2008 +0200 +++ b/en/examples/branch-named Wed Aug 20 21:55:35 2008 +0200 @@ -64,11 +64,10 @@ #$ name: update-bar hg update bar -hg update -C bar #$ name: merge hg branch -hg merge +hg merge foo hg commit -m 'Merge' hg tip
--- a/en/examples/branch-named.foo-commit.out Wed Aug 20 21:54:18 2008 +0200 +++ b/en/examples/branch-named.foo-commit.out Wed Aug 20 21:55:35 2008 +0200 @@ -1,6 +1,7 @@ $ \textbf{echo something > somefile} $ \textbf{hg commit -A -m 'New file'} adding somefile +created new head $ \textbf{hg heads} changeset: branch: foo
--- a/en/examples/branch-named.merge.out Wed Aug 20 21:54:18 2008 +0200 +++ b/en/examples/branch-named.merge.out Wed Aug 20 21:55:35 2008 +0200 @@ -1,6 +1,6 @@ $ \textbf{hg branch} bar -$ \textbf{hg merge} +$ \textbf{hg merge foo} 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ \textbf{hg commit -m 'Merge'}
--- a/en/examples/branch-named.update-bar.out Wed Aug 20 21:54:18 2008 +0200 +++ b/en/examples/branch-named.update-bar.out Wed Aug 20 21:55:35 2008 +0200 @@ -1,4 +1,2 @@ $ \textbf{hg update bar} -abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes -$ \textbf{hg update -C bar} 1 files updated, 0 files merged, 1 files removed, 0 files unresolved