test-pull-branch.out
59 lines
| 2.1 KiB
| text/plain
|
TextLexer
/ tests / test-pull-branch.out
Benoit Allard
|
r7372 | adding foo | ||
| marked working directory as branch branchA | ||||
| pulling from ../t | ||||
| requesting all changes | ||||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 2 changesets with 2 changes to 1 files | ||||
| (run 'hg update' to get a working copy) | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| % create branch B | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| marked working directory as branch branchB | ||||
| % a new branch is there | ||||
| pulling from ../t | ||||
| searching for changes | ||||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 2 changesets with 2 changes to 1 files (+1 heads) | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| % develop both branch | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| % should succeed, no new heads | ||||
| pulling from ../t | ||||
| searching for changes | ||||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 2 changesets with 2 changes to 1 files | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| % add an head on other branch | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| created new head | ||||
| % should succeed only one head on our branch | ||||
| pulling from ../t | ||||
| searching for changes | ||||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 3 changesets with 3 changes to 1 files (+1 heads) | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| created new head | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| % should fail new head in our branch | ||||
| pulling from ../t | ||||
| searching for changes | ||||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 4 changesets with 4 changes to 1 files (+1 heads) | ||||
| not updating, since new heads added | ||||
| (run 'hg heads' to see heads, 'hg merge' to merge) | ||||