Mercurial > hgbook
comparison en/examples/backout.manual.backout.out @ 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 | 006bbad1f190 |
| children |
comparison
equal
deleted
inserted
replaced
| 394:43bfadf9b760 | 395:e0b56f008b09 |
|---|---|
| 1 $ \textbf{echo third change >> myfile} | 1 $ \textbf{echo third change >> myfile} |
| 2 $ \textbf{hg commit -m 'third change'} | 2 $ \textbf{hg commit -m 'third change'} |
| 3 $ \textbf{hg backout -m 'back out second change' 1} | 3 $ \textbf{hg backout -m 'back out second change' 1} |
| 4 reverting myfile | 4 reverting myfile |
| 5 created new head | |
| 5 changeset backs out changeset | 6 changeset backs out changeset |
| 6 the backout changeset is a new head - do not forget to merge | 7 the backout changeset is a new head - do not forget to merge |
| 7 (use "backout --merge" if you want to auto-merge) | 8 (use "backout --merge" if you want to auto-merge) |