hgbook
annotate ja/examples/backout.non-tip.backout.out @ 1114:527b86d55d4a
inotify: update installation information
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
| author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
|---|---|
| date | Sun Dec 13 16:35:56 2009 +0900 (2009-12-13) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 $ \textbf{echo third change >> myfile} |
| foozy@708 | 2 $ \textbf{hg commit -m 'third change'} |
| foozy@708 | 3 $ \textbf{hg backout --merge -m 'back out second change' 1} |
| foozy@708 | 4 reverting myfile |
| foozy@708 | 5 changeset backs out changeset |
| foozy@708 | 6 merging with changeset |
| foozy@708 | 7 merging myfile |
| foozy@708 | 8 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| foozy@708 | 9 (branch merge, don't forget to commit) |