hgbook
view ja/examples/backout.non-tip.backout.out @ 993:71dbda516572
French translation : merge with Jean Marie Clement's work on ch04-concepts
| author | Frédéric Bouquet <youshe.jaalon@gmail.com> |
|---|---|
| date | Fri Sep 11 14:35:36 2009 +0200 (2009-09-11) |
| parents | |
| children |
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)