test-pull-update.out
32 lines
| 967 B
| text/plain
|
TextLexer
/ tests / test-pull-update.out
Thomas Arendsen Hein
|
r5080 | adding foo | ||
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Thomas Arendsen Hein
|
r5080 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
| % should fail | ||||
| pulling from ../tt | ||||
| searching for changes | ||||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
| not updating, since new heads added | ||||
| (run 'hg heads' to see heads, 'hg merge' to merge) | ||||
| % should fail | ||||
| pulling from ../t | ||||
| searching for changes | ||||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
| not updating, since new heads added | ||||
| (run 'hg heads' to see heads, 'hg merge' to merge) | ||||
| merging foo | ||||
| 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | ||||
| % should work | ||||
| pulling from ../tt | ||||
| searching for changes | ||||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 1 changesets with 1 changes to 1 files (-1 heads) | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||