Mercurial > hg-stable

changeset 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 e96f97ca0358
children 9433bdcaa9ae
files tests/test-newbranch tests/test-newbranch.out
diffstat 2 files changed, 27 insertions(+), 27 deletions(-) [+]
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
--- a/tests/test-newbranch.out	Fri Dec 01 15:43:48 2006 -0800
+++ b/tests/test-newbranch.out	Sat Dec 02 03:16:17 2006 -0200
@@ -4,55 +4,55 @@
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 foo
-changeset:   5:dc140083783b
+changeset:   5:5f8fb06e083e
 branch:      foo
 tag:         tip
-parent:      4:98d14f698afe
-parent:      3:9d567d0b51f9
+parent:      4:4909a3732169
+parent:      3:bf1bc2f45e83
 user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
+date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     merge
 
-changeset:   4:98d14f698afe
+changeset:   4:4909a3732169
 branch:      foo
-parent:      1:0079f24813e2
+parent:      1:b699b1cec9c2
 user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
+date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     modify a branch
 
-changeset:   3:9d567d0b51f9
+changeset:   3:bf1bc2f45e83
 user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
+date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     clear branch name
 
-changeset:   2:ed2bbf4e0102
+changeset:   2:67ec16bde7f1
 branch:      bar
 user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
+date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     change branch name
 
-changeset:   1:0079f24813e2
+changeset:   1:b699b1cec9c2
 branch:      foo
 user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
+date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     add branch name
 
-changeset:   0:db01e8ea3388
+changeset:   0:be8523e69bf8
 user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
+date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     initial
 
-foo                            5:dc140083783b
-bar                            2:ed2bbf4e0102
+foo                            5:5f8fb06e083e
+bar                            2:67ec16bde7f1
 foo
 bar
 % test for invalid branch cache
 rolling back last transaction
-changeset:   4:98d14f698afe
+changeset:   4:4909a3732169
 branch:      foo
 tag:         tip
-parent:      1:0079f24813e2
+parent:      1:b699b1cec9c2
 user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
+date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     modify a branch