Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-hook @ 2283:e506c14382fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deprecate 'update -m'. use 'merge' instead.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 14 May 2006 21:07:34 -0700
parents 3f7692b0ff13
children 109a22f5434a
comparison
equal deleted inserted replaced
2282:2efa636eb411 2283:e506c14382fd
27 hg commit -m a1 -d "1 0" 27 hg commit -m a1 -d "1 0"
28 hg update -C 0 28 hg update -C 0
29 echo b > b 29 echo b > b
30 hg add b 30 hg add b
31 hg commit -m b -d '1 0' 31 hg commit -m b -d '1 0'
32 hg update -m 1 32 hg merge 1
33 hg commit -m merge -d '2 0' 33 hg commit -m merge -d '2 0'
34 34
35 cd ../b 35 cd ../b
36 hg pull ../a 36 hg pull ../a
37 37