Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-push-warn @ 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 fc22ed56afe3
children 975c2469c316
comparison
equal deleted inserted replaced
2282:2efa636eb411 2283:e506c14382fd
21 hg commit -m "3" -d "1000000 0" 21 hg commit -m "3" -d "1000000 0"
22 22
23 hg push ../a 23 hg push ../a
24 hg pull ../a 24 hg pull ../a
25 hg push ../a 25 hg push ../a
26 hg up -m 26 hg merge
27 hg commit -m "4" -d "1000000 0" 27 hg commit -m "4" -d "1000000 0"
28 hg push ../a 28 hg push ../a
29 cd .. 29 cd ..
30 30
31 hg init c 31 hg init c
42 hg co -C $i 42 hg co -C $i
43 echo d-$i >> foo 43 echo d-$i >> foo
44 hg ci -m d-$i -d "1000000 0" 44 hg ci -m d-$i -d "1000000 0"
45 done 45 done
46 46
47 HGMERGE=true hg co -m 3 47 HGMERGE=true hg merge 3
48 hg ci -m c-d -d "1000000 0" 48 hg ci -m c-d -d "1000000 0"
49 49
50 hg push ../c 50 hg push ../c
51 hg push -r 2 ../c 51 hg push -r 2 ../c
52 hg push -r 3 -r 4 ../c 52 hg push -r 3 -r 4 ../c