Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-newbranch @ 3760:aeafd80c1e78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0"
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 02 Dec 2006 03:16:17 -0200
parents 8dc14d630b29
children 9433bdcaa9ae
comparison
equal deleted inserted replaced
3759:e96f97ca0358 3760:aeafd80c1e78
4 cd t 4 cd t
5 hg branches 5 hg branches
6 6
7 echo foo > a 7 echo foo > a
8 hg add a 8 hg add a
9 hg ci -m "initial" -d "0 0" 9 hg ci -m "initial" -d "1000000 0"
10 hg branch foo 10 hg branch foo
11 hg branch 11 hg branch
12 hg ci -m "add branch name" -d "0 0" 12 hg ci -m "add branch name" -d "1000000 0"
13 hg branch bar 13 hg branch bar
14 hg ci -m "change branch name" -d "0 0" 14 hg ci -m "change branch name" -d "1000000 0"
15 hg branch "" 15 hg branch ""
16 hg ci -m "clear branch name" -d "0 0" 16 hg ci -m "clear branch name" -d "1000000 0"
17 17
18 hg co foo 18 hg co foo
19 hg branch 19 hg branch
20 echo bleah > a 20 echo bleah > a
21 hg ci -m "modify a branch" -d "0 0" 21 hg ci -m "modify a branch" -d "1000000 0"
22 22
23 hg merge 23 hg merge
24 hg branch 24 hg branch
25 HG_MERGE=true hg ci -m "merge" -d "0 0" 25 hg ci -m "merge" -d "1000000 0"
26 hg log 26 hg log
27 27
28 hg branches 28 hg branches
29 hg branches -q 29 hg branches -q
30 30
31 echo % test for invalid branch cache 31 echo % test for invalid branch cache
32 hg rollback 32 hg rollback
33 hg tip 33 hg log -r foo