hgbook
view ja/examples/backout.non-tip.backout.out @ 1030:2ac31ea48a3d
merge with trunk
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Thu Apr 22 12:39:32 2010 +0200 (2010-04-22) |
| 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)