Mercurial > hg > hg-fastimport
comparison tests/test-fastimport-anonbranch.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 | d246bcee93ec |
| children | 1cf21a8c274b |
comparison
equal
deleted
inserted
replaced
| 46:93c2b1e832bd | 47:7ff36dc9f0b1 |
|---|---|
| 1 % import | 1 % import |
| 2 Reading source: ../anonbranch.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 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 5 6 initial revision |
| 6 Done commit of rev 1 | 6 5 modify foo, add bla |
| 7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 7 4 add oog |
| 8 Done commit of rev 2 | 8 3 modify bla |
| 9 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 9 2 remove oog |
| 10 Done commit of rev 3 | 10 1 modify foo |
| 11 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 11 0 merge |
| 12 Done commit of rev 4 | 12 Removing blob dir 'HGTMP/test-fastimport-anonbranch/anonbranch/.hg/blobs' ... |
| 13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 14 Done commit of rev 5 | |
| 15 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 16 Done commit of rev 6 | |
| 17 % log | 13 % log |
| 18 @ 6:c454087588c4 | 14 o 6:ca2d9acb975f |
| 19 |\ merge | 15 |\ merge |
| 20 | | | 16 | | |
| 21 | o 5:d7502914e05c | 17 | o 5:426c5bd79694 |
| 22 | | modify foo | 18 | | modify foo |
| 23 | | | 19 | | |
| 24 o | 4:5dde14f70320 | 20 o | 4:32f018ede0f8 |
| 25 | | remove oog | 21 | | remove oog |
| 26 | | | 22 | | |
| 27 | o 3:66562011aee8 | 23 | o 3:7c78b201cf49 |
| 28 | | modify bla | 24 | | modify bla |
| 29 | | | 25 | | |
| 30 o | 2:3851fabfd46c | 26 o | 2:b4dd3ea3dee1 |
| 31 |/ add oog | 27 |/ add oog |
| 32 | | 28 | |
| 33 o 1:c09a5b11c17e | 29 o 1:60da203876bc |
| 34 | modify foo, add bla | 30 | modify foo, add bla |
| 35 | | 31 | |
| 36 o 0:67886358f17d | 32 o 0:2eab317db71a |
| 37 initial revision | 33 initial revision |
| 38 | 34 |
| 39 % manifest at rev 0 | 35 % manifest at rev 0 |
| 40 bar | 36 bar |
| 41 foo | 37 foo |
| 54 % contents of bar at rev 6 | 50 % contents of bar at rev 6 |
| 55 bar | 51 bar |
| 56 % contents of bla at rev 6 | 52 % contents of bla at rev 6 |
| 57 blah blah | 53 blah blah |
| 58 % diff merge with first parent (rev 4:6) | 54 % diff merge with first parent (rev 4:6) |
| 59 diff -r 5dde14f70320 -r c454087588c4 bla | 55 diff -r 32f018ede0f8 -r ca2d9acb975f bla |
| 60 --- a/bla Thu Jan 10 21:23:00 2008 +0000 | 56 --- a/bla Thu Jan 10 21:23:00 2008 +0000 |
| 61 +++ b/bla Thu Jan 10 21:24:00 2008 +0000 | 57 +++ b/bla Thu Jan 10 21:24:00 2008 +0000 |
| 62 @@ -1,1 +1,1 @@ | 58 @@ -1,1 +1,1 @@ |
| 63 -bla | 59 -bla |
| 64 +blah blah | 60 +blah blah |
| 65 % diff merge with second parent (rev 5:6) | 61 % diff merge with second parent (rev 5:6) |
| 66 diff -r d7502914e05c -r c454087588c4 foo | 62 diff -r 426c5bd79694 -r ca2d9acb975f foo |
| 67 --- a/foo Thu Jan 10 21:23:30 2008 +0000 | 63 --- a/foo Thu Jan 10 21:23:30 2008 +0000 |
| 68 +++ b/foo Thu Jan 10 21:24:00 2008 +0000 | 64 +++ b/foo Thu Jan 10 21:24:00 2008 +0000 |
| 69 @@ -1,1 +1,1 @@ | 65 @@ -1,1 +1,1 @@ |
| 70 -foo foo | 66 -foo foo |
| 71 +oof | 67 +oof |