test-convert-darcs.out
43 lines
| 1.1 KiB
| text/plain
|
TextLexer
/ tests / test-convert-darcs.out
Patrick Mezard
|
r5413 | % initialize darcs repo | ||
| Finished recording patch 'p0' | ||||
| % branch and update | ||||
| Finished recording patch 'p1.1' | ||||
| % update source | ||||
| Finished recording patch 'p1.2' | ||||
| % merge branch | ||||
Bryan O'Sullivan
|
r9326 | Backing up ./a(-darcs-backup0) | ||
|
Patrick Mezard
|
r5413 | We have conflicts in the following files: | ||
| ./a | ||||
| Finished pulling and applying. | ||||
| Finished recording patch 'p2' | ||||
|
Patrick Mezard
|
r9526 | % test file and directory move | ||
| Finished recording patch 'p3' | ||||
Brodie Rao
|
r12252 | % test utf-8 commit message and author | ||
| Finished recording patch 'p4: desc ñ' | ||||
|
Patrick Mezard
|
r5413 | initializing destination darcs-repo-hg repository | ||
| scanning source... | ||||
| sorting... | ||||
| converting... | ||||
|
Brodie Rao
|
r12252 | 5 p0 | ||
| 4 p1.2 | ||||
| 3 p1.1 | ||||
| 2 p2 | ||||
| 1 p3 | ||||
| 0 p4: desc ? | ||||
| o 5 "p4: desc ñ" (author ñ) files: g | ||||
|
Patrick Mezard
|
r9526 | | | ||
|
Brodie Rao
|
r12252 | o 4 "p3" (test@example.org) files: dir/d dir/d2 dir2/d f ff | ||
|
Patrick Mezard
|
r5413 | | | ||
|
Brodie Rao
|
r12252 | o 3 "p2" (test@example.org) files: a dir/d dir/d2 f | ||
|
Patrick Mezard
|
r5413 | | | ||
|
Brodie Rao
|
r12252 | o 2 "p1.1" (test@example.org) files: | ||
|
Patrick Mezard
|
r5413 | | | ||
|
Brodie Rao
|
r12252 | o 1 "p1.2" (test@example.org) files: a b | ||
| | | ||||
| o 0 "p0" (test@example.org) files: a | ||||
|
Patrick Mezard
|
r5413 | |||
| 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a | ||||
| 1e88685f5ddec574a34c70af492f95b6debc8741 644 b | ||||
Ronny Pfannschmidt
|
r10490 | 37406831adc447ec2385014019599dfec953c806 644 dir2/d | ||
| b783a337463792a5c7d548ad85a7d3253c16ba8c 644 ff | ||||
|
Brodie Rao
|
r12252 | 0973eb1b2ecc4de7fafe7447ce1b7462108b4848 644 g | ||