--- a/tests/test-newbranch.t Mon May 02 12:36:23 2011 +0200
+++ b/tests/test-newbranch.t Mon May 02 19:20:29 2011 +0200
@@ -31,7 +31,7 @@
There should be only one default branch head
$ hg heads .
- changeset: 3:9d567d0b51f9
+ changeset: 3:1c28f494dae6
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
@@ -54,34 +54,34 @@
$ hg ci -m "merge"
$ hg log
- changeset: 5:dc140083783b
+ changeset: 5:530046499edf
branch: foo
tag: tip
- parent: 4:98d14f698afe
- parent: 3:9d567d0b51f9
+ parent: 4:adf1a74a7f7b
+ parent: 3:1c28f494dae6
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: merge
- changeset: 4:98d14f698afe
+ changeset: 4:adf1a74a7f7b
branch: foo
- parent: 1:0079f24813e2
+ parent: 1:6c0e42da283a
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: modify a branch
- changeset: 3:9d567d0b51f9
+ changeset: 3:1c28f494dae6
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: clear branch name
- changeset: 2:ed2bbf4e0102
+ changeset: 2:c21617b13b22
branch: bar
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: change branch name
- changeset: 1:0079f24813e2
+ changeset: 1:6c0e42da283a
branch: foo
user: test
date: Thu Jan 01 00:00:00 1970 +0000
@@ -93,9 +93,9 @@
summary: initial
$ hg branches
- foo 5:dc140083783b
- default 3:9d567d0b51f9 (inactive)
- bar 2:ed2bbf4e0102 (inactive)
+ foo 5:530046499edf
+ default 3:1c28f494dae6 (inactive)
+ bar 2:c21617b13b22 (inactive)
$ hg branches -q
foo
@@ -111,10 +111,10 @@
$ cp $branchcache .hg/bc-invalid
$ hg log -r foo
- changeset: 4:98d14f698afe
+ changeset: 4:adf1a74a7f7b
branch: foo
tag: tip
- parent: 1:0079f24813e2
+ parent: 1:6c0e42da283a
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: modify a branch
@@ -123,12 +123,12 @@
$ hg --debug log -r foo
invalidating branch cache (tip differs)
- changeset: 4:98d14f698afeaff8cb612dcf215ce95e639effc3
+ changeset: 4:adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6
branch: foo
tag: tip
- parent: 1:0079f24813e2b73a891577c243684c5066347bc8
+ parent: 1:6c0e42da283a56b5edc5b4fadb491365ec7f5fa8
parent: -1:0000000000000000000000000000000000000000
- manifest: 4:d01b250baaa05909152f7ae07d7a649deea0df9a
+ manifest: 1:8c342a37dfba0b3d3ce073562a00d8a813c54ffe
user: test
date: Thu Jan 01 00:00:00 1970 +0000
files: a
@@ -141,13 +141,13 @@
$ echo corrupted > $branchcache
$ hg log -qr foo
- 4:98d14f698afe
+ 4:adf1a74a7f7b
$ cat $branchcache
- 98d14f698afeaff8cb612dcf215ce95e639effc3 4
- 9d567d0b51f9e2068b054e1948e1a927f99b5874 default
- 98d14f698afeaff8cb612dcf215ce95e639effc3 foo
- ed2bbf4e01029020711be82ca905283e883f0e11 bar
+ adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 4
+ 1c28f494dae69a2f8fc815059d257eccf3fcfe75 default
+ adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 foo
+ c21617b13b220988e7a2e26290fbe4325ffa7139 bar
Push should update the branch cache:
@@ -166,22 +166,22 @@
$ hg push -qf ../target
$ cat ../target/$branchcache
- 98d14f698afeaff8cb612dcf215ce95e639effc3 4
- 9d567d0b51f9e2068b054e1948e1a927f99b5874 default
- 98d14f698afeaff8cb612dcf215ce95e639effc3 foo
- ed2bbf4e01029020711be82ca905283e883f0e11 bar
+ adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 4
+ 1c28f494dae69a2f8fc815059d257eccf3fcfe75 default
+ adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 foo
+ c21617b13b220988e7a2e26290fbe4325ffa7139 bar
Update with no arguments: tipmost revision of the current branch:
$ hg up -q -C 0
$ hg up -q
$ hg id
- 9d567d0b51f9
+ 1c28f494dae6
$ hg up -q 1
$ hg up -q
$ hg id
- 98d14f698afe (foo) tip
+ adf1a74a7f7b (foo) tip
$ hg branch foobar
marked working directory as branch foobar
@@ -210,11 +210,11 @@
foo
$ hg commit -m'Merge ff into foo'
$ hg parents
- changeset: 6:917eb54e1b4b
+ changeset: 6:185ffbfefa30
branch: foo
tag: tip
- parent: 4:98d14f698afe
- parent: 5:6683a60370cb
+ parent: 4:adf1a74a7f7b
+ parent: 5:1a3c27dc5e11
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Merge ff into foo