Mercurial > hgbook
changeset 395:e0b56f008b09
Fix sample output for 'backout' test.
| author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
|---|---|
| date | Wed, 20 Aug 2008 21:51:54 +0200 |
| 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 |
| diffstat | 6 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/en/examples/backout.manual.backout.out Wed Aug 20 21:50:17 2008 +0200 +++ b/en/examples/backout.manual.backout.out Wed Aug 20 21:51:54 2008 +0200 @@ -2,6 +2,7 @@ $ \textbf{hg commit -m 'third change'} $ \textbf{hg backout -m 'back out second change' 1} reverting myfile +created new head changeset backs out changeset the backout changeset is a new head - do not forget to merge (use "backout --merge" if you want to auto-merge)
--- a/en/examples/backout.manual.cat.out Wed Aug 20 21:50:17 2008 +0200 +++ b/en/examples/backout.manual.cat.out Wed Aug 20 21:51:54 2008 +0200 @@ -1,2 +1,4 @@ $ \textbf{cat myfile} first change +second change +third change
--- a/en/examples/backout.manual.clone.out Wed Aug 20 21:50:17 2008 +0200 +++ b/en/examples/backout.manual.clone.out Wed Aug 20 21:51:54 2008 +0200 @@ -5,5 +5,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ \textbf{cd newrepo}
--- a/en/examples/backout.manual.parents.out Wed Aug 20 21:50:17 2008 +0200 +++ b/en/examples/backout.manual.parents.out Wed Aug 20 21:51:54 2008 +0200 @@ -1,8 +1,6 @@ $ \textbf{hg parents} changeset: -tag: tip -parent: user: Bryan O'Sullivan <bos@serpentine.com> -summary: back out second change +summary: third change
--- a/en/examples/backout.non-tip.backout.out Wed Aug 20 21:50:17 2008 +0200 +++ b/en/examples/backout.non-tip.backout.out Wed Aug 20 21:51:54 2008 +0200 @@ -2,6 +2,7 @@ $ \textbf{hg commit -m 'third change'} $ \textbf{hg backout --merge -m 'back out second change' 1} reverting myfile +created new head changeset backs out changeset merging with changeset merging myfile
--- a/en/examples/backout.non-tip.clone.out Wed Aug 20 21:50:17 2008 +0200 +++ b/en/examples/backout.non-tip.clone.out Wed Aug 20 21:51:54 2008 +0200 @@ -5,5 +5,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ \textbf{cd non-tip-repo}