annotate en/examples/backout.non-tip.backout.out @ 298:2b8c6aa370d5
Fix sample output for test 'branch-repo'.
| author |
Guido Ostkamp <hg@ostkamp.fastmail.fm> |
| date |
Wed Aug 20 21:54:18 2008 +0200 (2008-08-20) |
| parents |
006bbad1f190 |
| children |
|
| rev |
line source |
|
bos@144
|
1 $ \textbf{echo third change >> myfile}
|
|
bos@144
|
2 $ \textbf{hg commit -m 'third change'}
|
|
bos@144
|
3 $ \textbf{hg backout --merge -m 'back out second change' 1}
|
|
bos@144
|
4 reverting myfile
|
|
hg@296
|
5 created new head
|
|
bos@144
|
6 changeset backs out changeset
|
|
bos@144
|
7 merging with changeset
|
|
bos@144
|
8 merging myfile
|
|
bos@144
|
9 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
bos@144
|
10 (branch merge, don't forget to commit)
|
