view tests/test-branches.out @ 6665:73f49bef13ad

merge from crew-stable
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 12 Jun 2008 13:12:09 +0200
parents a2b13cac0922
children 7d6622eaad08
line wrap: on
line source

marked working directory as branch a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch b
created new head
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
marked working directory as branch c
marked working directory as branch d
d                              6:9c581c5ff105
b                              4:22df7444f7c1
a                              1:dd6b440dd85a
c                              5:5ca481e59b8c (inactive)
default                        0:19709c5a4e75 (inactive)
-------
d                              6:9c581c5ff105
b                              4:22df7444f7c1
a                              1:dd6b440dd85a
--- Branch a
changeset:   1:dd6b440dd85a
branch:      a
user:        test
date:        Thu Jan 01 00:00:01 1970 +0000
summary:     Adding a branch

---- Branch b
changeset:   4:22df7444f7c1
branch:      b
parent:      2:ac22033332d1
user:        test
date:        Thu Jan 01 00:00:04 1970 +0000
summary:     Adding b branch head 2

changeset:   3:aee39cd168d0
branch:      b
user:        test
date:        Thu Jan 01 00:00:03 1970 +0000
summary:     Adding b branch head 1

changeset:   2:ac22033332d1
branch:      b
parent:      0:19709c5a4e75
user:        test
date:        Thu Jan 01 00:00:02 1970 +0000
summary:     Adding b branch