Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-convert-darcs.out @ 5413:719fd175181f
Test darcs converter
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 07 Oct 2007 19:03:32 +0200 |
| parents | |
| children |
comparison
equal
deleted
inserted
replaced
| 5412:fbf40ad5a8c2 | 5413:719fd175181f |
|---|---|
| 1 % initialize darcs repo | |
| 2 Finished recording patch 'p0' | |
| 3 % branch and update | |
| 4 | |
| 5 Copying patch 1 of 1... | |
| 6 Copying patch 1 of 1... done. | |
| 7 Finished getting. | |
| 8 Finished recording patch 'p1.1' | |
| 9 % update source | |
| 10 Finished recording patch 'p1.2' | |
| 11 % merge branch | |
| 12 We have conflicts in the following files: | |
| 13 ./a | |
| 14 Finished pulling and applying. | |
| 15 Finished recording patch 'p2' | |
| 16 initializing destination darcs-repo-hg repository | |
| 17 scanning source... | |
| 18 sorting... | |
| 19 converting... | |
| 20 3 p0 | |
| 21 2 p1.2 | |
| 22 1 p1.1 | |
| 23 0 p2 | |
| 24 o 3 "p2" files: a | |
| 25 | | |
| 26 o 2 "p1.1" files: | |
| 27 | | |
| 28 o 1 "p1.2" files: a b | |
| 29 | | |
| 30 o 0 "p0" files: a | |
| 31 | |
| 32 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a | |
| 33 1e88685f5ddec574a34c70af492f95b6debc8741 644 b |