test-manifest-merging.out
15 lines
| 521 B
| text/plain
|
TextLexer
/ tests / test-manifest-merging.out
Giorgos Keramidas
|
r3325 | % init foo-base | ||
| % create alpha in first repo | ||||
| adding alpha | ||||
| % clone foo-base to foo-work | ||||
Adrian Buehlmann
|
r6338 | updating working directory | ||
|
Giorgos Keramidas
|
r3325 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
| % create beta in second repo | ||||
| adding beta | ||||
| % create gamma in first repo | ||||
| adding gamma | ||||
| % pull into work and merge | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | ||||
| % revert to changeset 1 to simulate a failed merge | ||||
| 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||