hgbook
changeset 296:e0b56f008b09
Fix sample output for 'backout' test.
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed Aug 20 21:51:54 2008 +0200 (2008-08-20) |
parents | 43bfadf9b760 |
children | bd8d96d3703d |
files | en/examples/backout.manual.backout.out en/examples/backout.manual.cat.out en/examples/backout.manual.clone.out en/examples/backout.manual.parents.out en/examples/backout.non-tip.backout.out en/examples/backout.non-tip.clone.out |
line diff
1.1 --- a/en/examples/backout.manual.backout.out Wed Aug 20 21:50:17 2008 +0200 1.2 +++ b/en/examples/backout.manual.backout.out Wed Aug 20 21:51:54 2008 +0200 1.3 @@ -2,6 +2,7 @@ 1.4 $ \textbf{hg commit -m 'third change'} 1.5 $ \textbf{hg backout -m 'back out second change' 1} 1.6 reverting myfile 1.7 +created new head 1.8 changeset backs out changeset 1.9 the backout changeset is a new head - do not forget to merge 1.10 (use "backout --merge" if you want to auto-merge)
2.1 --- a/en/examples/backout.manual.cat.out Wed Aug 20 21:50:17 2008 +0200 2.2 +++ b/en/examples/backout.manual.cat.out Wed Aug 20 21:51:54 2008 +0200 2.3 @@ -1,2 +1,4 @@ 2.4 $ \textbf{cat myfile} 2.5 first change 2.6 +second change 2.7 +third change
3.1 --- a/en/examples/backout.manual.clone.out Wed Aug 20 21:50:17 2008 +0200 3.2 +++ b/en/examples/backout.manual.clone.out Wed Aug 20 21:51:54 2008 +0200 3.3 @@ -5,5 +5,6 @@ 3.4 adding manifests 3.5 adding file changes 3.6 added 2 changesets with 2 changes to 1 files 3.7 +updating working directory 3.8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 3.9 $ \textbf{cd newrepo}
4.1 --- a/en/examples/backout.manual.parents.out Wed Aug 20 21:50:17 2008 +0200 4.2 +++ b/en/examples/backout.manual.parents.out Wed Aug 20 21:51:54 2008 +0200 4.3 @@ -1,8 +1,6 @@ 4.4 $ \textbf{hg parents} 4.5 changeset: 4.6 -tag: tip 4.7 -parent: 4.8 user: Bryan O'Sullivan <bos@serpentine.com> 4.9 4.10 -summary: back out second change 4.11 +summary: third change 4.12
5.1 --- a/en/examples/backout.non-tip.backout.out Wed Aug 20 21:50:17 2008 +0200 5.2 +++ b/en/examples/backout.non-tip.backout.out Wed Aug 20 21:51:54 2008 +0200 5.3 @@ -2,6 +2,7 @@ 5.4 $ \textbf{hg commit -m 'third change'} 5.5 $ \textbf{hg backout --merge -m 'back out second change' 1} 5.6 reverting myfile 5.7 +created new head 5.8 changeset backs out changeset 5.9 merging with changeset 5.10 merging myfile
6.1 --- a/en/examples/backout.non-tip.clone.out Wed Aug 20 21:50:17 2008 +0200 6.2 +++ b/en/examples/backout.non-tip.clone.out Wed Aug 20 21:51:54 2008 +0200 6.3 @@ -5,5 +5,6 @@ 6.4 adding manifests 6.5 adding file changes 6.6 added 2 changesets with 2 changes to 1 files 6.7 +updating working directory 6.8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 6.9 $ \textbf{cd non-tip-repo}