Mercurial > public > mercurial-scm > hg
diff tests/test-newbranch @ 3760:aeafd80c1e78
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 |
line wrap: on
line diff
--- a/tests/test-newbranch Fri Dec 01 15:43:48 2006 -0800 +++ b/tests/test-newbranch Sat Dec 02 03:16:17 2006 -0200 @@ -6,23 +6,23 @@ echo foo > a hg add a -hg ci -m "initial" -d "0 0" +hg ci -m "initial" -d "1000000 0" hg branch foo hg branch -hg ci -m "add branch name" -d "0 0" +hg ci -m "add branch name" -d "1000000 0" hg branch bar -hg ci -m "change branch name" -d "0 0" +hg ci -m "change branch name" -d "1000000 0" hg branch "" -hg ci -m "clear branch name" -d "0 0" +hg ci -m "clear branch name" -d "1000000 0" hg co foo hg branch echo bleah > a -hg ci -m "modify a branch" -d "0 0" +hg ci -m "modify a branch" -d "1000000 0" hg merge hg branch -HG_MERGE=true hg ci -m "merge" -d "0 0" +hg ci -m "merge" -d "1000000 0" hg log hg branches @@ -30,4 +30,4 @@ echo % test for invalid branch cache hg rollback -hg tip +hg log -r foo