view tests/test-branch-option.out @ 11144:ca46910dd9ea

merge with stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 11 May 2010 20:21:25 +0200
parents a78bfaf988e1
children 5b48d819d5f9 05ac42e56452
line wrap: on
line source

marked working directory as branch a
adding foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
marked working directory as branch c
created new head
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating to branch a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
marked working directory as branch b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
marked working directory as branch b
created new head
in rev c branch a
1:dd6e60a716c6
2:f25d57ab0566
1:dd6e60a716c6
2:f25d57ab0566
out branch .
2:65511d0e2b55
2:65511d0e2b55
clone branch b
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files (+1 heads)
updating to branch b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2:65511d0e2b55
1:b84708d77ab7
2:65511d0e2b55
clone rev a branch b
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files (+1 heads)
updating to branch a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2:65511d0e2b55
1:b84708d77ab7
0:5b65ba7c951d