tests/test-newbranch.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 07 Nov 2006 22:18:34 +0100
changeset 3622 535da78ae47b
parent 3502 8dc14d630b29
child 3760 aeafd80c1e78
permissions -rw-r--r--
Merge with upstream

foo
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
foo
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
foo
changeset:   5:dc140083783b
branch:      foo
tag:         tip
parent:      4:98d14f698afe
parent:      3:9d567d0b51f9
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     merge

changeset:   4:98d14f698afe
branch:      foo
parent:      1:0079f24813e2
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     modify a branch

changeset:   3:9d567d0b51f9
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     clear branch name

changeset:   2:ed2bbf4e0102
branch:      bar
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     change branch name

changeset:   1:0079f24813e2
branch:      foo
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add branch name

changeset:   0:db01e8ea3388
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     initial

foo                            5:dc140083783b
bar                            2:ed2bbf4e0102
foo
bar
% test for invalid branch cache
rolling back last transaction
changeset:   4:98d14f698afe
branch:      foo
tag:         tip
parent:      1:0079f24813e2
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     modify a branch