hgbook
changeset 299:2936cb7eae7a
Fix sample output for test 'branch-named'.
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed Aug 20 21:55:35 2008 +0200 (2008-08-20) |
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 |
line diff
1.1 --- a/en/examples/branch-named Wed Aug 20 21:54:18 2008 +0200 1.2 +++ b/en/examples/branch-named Wed Aug 20 21:55:35 2008 +0200 1.3 @@ -64,11 +64,10 @@ 1.4 #$ name: update-bar 1.5 1.6 hg update bar 1.7 -hg update -C bar 1.8 1.9 #$ name: merge 1.10 1.11 hg branch 1.12 -hg merge 1.13 +hg merge foo 1.14 hg commit -m 'Merge' 1.15 hg tip
2.1 --- a/en/examples/branch-named.foo-commit.out Wed Aug 20 21:54:18 2008 +0200 2.2 +++ b/en/examples/branch-named.foo-commit.out Wed Aug 20 21:55:35 2008 +0200 2.3 @@ -1,6 +1,7 @@ 2.4 $ \textbf{echo something > somefile} 2.5 $ \textbf{hg commit -A -m 'New file'} 2.6 adding somefile 2.7 +created new head 2.8 $ \textbf{hg heads} 2.9 changeset: 2.10 branch: foo
3.1 --- a/en/examples/branch-named.merge.out Wed Aug 20 21:54:18 2008 +0200 3.2 +++ b/en/examples/branch-named.merge.out Wed Aug 20 21:55:35 2008 +0200 3.3 @@ -1,6 +1,6 @@ 3.4 $ \textbf{hg branch} 3.5 bar 3.6 -$ \textbf{hg merge} 3.7 +$ \textbf{hg merge foo} 3.8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 3.9 (branch merge, don't forget to commit) 3.10 $ \textbf{hg commit -m 'Merge'}
4.1 --- a/en/examples/branch-named.update-bar.out Wed Aug 20 21:54:18 2008 +0200 4.2 +++ b/en/examples/branch-named.update-bar.out Wed Aug 20 21:55:35 2008 +0200 4.3 @@ -1,4 +1,2 @@ 4.4 $ \textbf{hg update bar} 4.5 -abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes 4.6 -$ \textbf{hg update -C bar} 4.7 1 files updated, 0 files merged, 1 files removed, 0 files unresolved