test-586.out
38 lines
| 1.0 KiB
| text/plain
|
TextLexer
/ tests / test-586.out
Matt Mackall
|
r4535 | adding a | ||
| adding b | ||||
| pulling from ../a | ||||
| searching for changes | ||||
| warning: repository is unrelated | ||||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
| (run 'hg heads' to see heads, 'hg merge' to merge) | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | ||||
|
Matt Mackall
|
r5764 | C b | ||
Patrick Mezard
|
r7564 | % create test repos | ||
| adding a | ||||
| adding b | ||||
| pulling from ../repoa | ||||
| requesting all changes | ||||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 1 changesets with 1 changes to 1 files | ||||
| (run 'hg update' to get a working copy) | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| pulling from ../repob | ||||
| searching for changes | ||||
| warning: repository is unrelated | ||||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
| (run 'hg heads' to see heads, 'hg merge' to merge) | ||||
| % merge both repos | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | ||||
| % move b content | ||||
| src/b | ||||
| tst/a | ||||