annotate en/examples/backout.non-tip.backout.out @ 179:5fc4a45c069f
Continue documentation of collaboration models.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Fri Mar 30 23:05:28 2007 -0700 (2007-03-30) |
| parents |
|
| children |
e0b56f008b09 |
| 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
|
|
bos@144
|
5 changeset backs out changeset
|
|
bos@144
|
6 merging with changeset
|
|
bos@144
|
7 merging myfile
|
|
bos@144
|
8 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
bos@144
|
9 (branch merge, don't forget to commit)
|
