Mercurial > hg > hg-fastimport
comparison tests/test-fastimport-syntax.out @ 47:7ff36dc9f0b1
Massive rework to use infrastructure provided by convert extension.
fastimport no longer stages changes in the repository's working copy;
instead, it now works like any other convert source: the imported
history is kept in memory (except for file contents) and then
processed by the 'convert' extension.
| author | Greg Ward <greg-hg@gerg.ca> |
|---|---|
| date | Sat, 16 May 2009 12:57:22 -0400 |
| parents | 8a92919bcd16 |
| children | a739b8dc8e6f |
comparison
equal
deleted
inserted
replaced
| 46:93c2b1e832bd | 47:7ff36dc9f0b1 |
|---|---|
| 1 % dump with no blank line after merge commit | 1 % dump with no blank line after merge commit |
| 2 Reading source: ../test1.dump | 2 scanning source... |
| 3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 3 sorting... |
| 4 Done commit of rev 0 | 4 converting... |
| 5 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 5 2 |
| 6 Done commit of rev 1 | 6 1 |
| 7 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 7 0 |
| 8 Done commit of rev 2 | 8 o 2:0c314954ac3f |
| 9 @ 2:feeb61781acb | |
| 10 |\ | 9 |\ |
| 11 | | | 10 | | |
| 12 | o 1:4ebe0e085b60 | 11 | o 1:1c1c7986a7e1 |
| 13 |/ | 12 |/ |
| 14 | | 13 | |
| 15 o 0:39327e07c83d | 14 o 0:ca38501957af |
| 16 | 15 |
| 17 | 16 |
| 18 % dump with redundant 'from' directive | 17 % dump with redundant 'from' directive |
| 19 Reading source: ../test2.dump | 18 scanning source... |
| 20 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 19 sorting... |
| 21 Done commit of rev 0 | 20 converting... |
| 22 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 21 1 |
| 23 Done commit of rev 1 | 22 0 |
| 24 @ 1:4ebe0e085b60 | 23 o 1:1c1c7986a7e1 |
| 25 | | 24 | |
| 26 | | 25 | |
| 27 o 0:39327e07c83d | 26 o 0:ca38501957af |
| 28 | 27 |
| 29 | 28 |