hgbook
view en/examples/backout.non-tip.backout.out @ 293:7273d06279d1
Fixed sample output for 'daily.files' test.
| author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
|---|---|
| date | Wed Aug 20 21:49:20 2008 +0200 (2008-08-20) |
| parents | |
| children | e0b56f008b09 |
line source
1 $ \textbf{echo third change >> myfile}
2 $ \textbf{hg commit -m 'third change'}
3 $ \textbf{hg backout --merge -m 'back out second change' 1}
4 reverting myfile
5 changeset backs out changeset
6 merging with changeset
7 merging myfile
8 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
9 (branch merge, don't forget to commit)