Mercurial > hg > hg-fastimport
comparison tests/test-fastimport-cvs2git-fixup.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 | 783890f8a6fb |
| children |
comparison
equal
deleted
inserted
replaced
| 46:93c2b1e832bd | 47:7ff36dc9f0b1 |
|---|---|
| 1 ---------------------------------------- | 1 ---------------------------------------- |
| 2 % import git-dump-1.dat | 2 % import git-dump-1.dat |
| 3 Reading source: git-blob.dat | 3 scanning source... |
| 4 Reading source: git-dump-1.dat | 4 sorting... |
| 5 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 5 converting... |
| 6 Done commit of rev 0 | 6 3 added Makefile |
| 7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 7 2 create branch 'REL-2-2-3' (manufactured commit) |
| 8 Done commit of rev 1 | 8 1 create tag 'REL-2-2-3-P1' (manufactured commit) |
| 9 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 9 0 added iostream.h |
| 10 Done commit of rev 2 | |
| 11 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 12 Done commit of rev 3 | |
| 13 updating tags | 10 updating tags |
| 14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 15 Removing blob dir 'HGTMP/test-fastimport-cvs2git-fixup/realcvs.1/.hg/blobs' ... | 11 Removing blob dir 'HGTMP/test-fastimport-cvs2git-fixup/realcvs.1/.hg/blobs' ... |
| 16 % hg glog (git-dump-1.dat) | 12 % hg glog (git-dump-1.dat) |
| 17 @ rev: 4 | 13 o rev: 4 |
| 18 | author: convert-repo | 14 | author: convert-repo |
| 19 | branch: '' tags: tip | 15 | branch: '' tags: tip |
| 20 | files: .hgtags | 16 | files: .hgtags |
| 21 | desc: update tags | 17 | desc: update tags |
| 22 | | 18 | |
| 25 | branch: '' tags: | 21 | branch: '' tags: |
| 26 | files: main.cpp | 22 | files: main.cpp |
| 27 | desc: added iostream.h | 23 | desc: added iostream.h |
| 28 | | 24 | |
| 29 | o rev: 2 | 25 | o rev: 2 |
| 30 | | author: cvs2git <cvs2git> | 26 | | author: cvs2git |
| 31 | | branch: 'REL-2-2-3' tags: REL-2-2-3-P1 | 27 | | branch: 'REL-2-2-3' tags: REL-2-2-3-P1 |
| 32 | | files: Tools/Debug/C++/DebugCpp.doxygen | 28 | | files: Tools/Debug/C++/DebugCpp.doxygen |
| 33 | | desc: create tag 'REL-2-2-3-P1' (manufactured commit) | 29 | | desc: create tag 'REL-2-2-3-P1' (manufactured commit) |
| 34 | | | 30 | | |
| 35 | o rev: 1 | 31 | o rev: 1 |
| 36 |/ author: cvs2git <cvs2git> | 32 |/ author: cvs2git |
| 37 | branch: 'REL-2-2-3' tags: | 33 | branch: 'REL-2-2-3' tags: |
| 38 | files: | 34 | files: |
| 39 | desc: create branch 'REL-2-2-3' (manufactured commit) | 35 | desc: create branch 'REL-2-2-3' (manufactured commit) |
| 40 | | 36 | |
| 41 o rev: 0 | 37 o rev: 0 |
| 43 branch: '' tags: | 39 branch: '' tags: |
| 44 files: Makefile | 40 files: Makefile |
| 45 desc: added Makefile | 41 desc: added Makefile |
| 46 | 42 |
| 47 % hg branches (git-dump-1.dat) | 43 % hg branches (git-dump-1.dat) |
| 48 REL-2-2-3 2:9c706dffba0e | 44 REL-2-2-3 2:b4709b6ae328 |
| 49 % hg heads -v (git-dump-1.dat) | 45 % hg heads -v (git-dump-1.dat) |
| 50 rev: 4 | 46 rev: 4 |
| 51 author: convert-repo | 47 author: convert-repo |
| 52 branch: '' tags: tip | 48 branch: '' tags: tip |
| 53 files: .hgtags | 49 files: .hgtags |
| 54 desc: update tags | 50 desc: update tags |
| 55 | 51 |
| 56 rev: 2 | 52 rev: 2 |
| 57 author: cvs2git <cvs2git> | 53 author: cvs2git |
| 58 branch: 'REL-2-2-3' tags: REL-2-2-3-P1 | 54 branch: 'REL-2-2-3' tags: REL-2-2-3-P1 |
| 59 files: Tools/Debug/C++/DebugCpp.doxygen | 55 files: Tools/Debug/C++/DebugCpp.doxygen |
| 60 desc: create tag 'REL-2-2-3-P1' (manufactured commit) | 56 desc: create tag 'REL-2-2-3-P1' (manufactured commit) |
| 61 | 57 |
| 62 % hg tags -v (git-dump-1.dat) | 58 % hg tags -v (git-dump-1.dat) |
| 63 REL-2-2-3-P1 2:9c706dffba0e | 59 REL-2-2-3-P1 2:b4709b6ae328 |
| 64 ---------------------------------------- | 60 ---------------------------------------- |
| 65 % import git-dump-2.dat | 61 % import git-dump-2.dat |
| 66 Reading source: git-blob.dat | 62 scanning source... |
| 67 Reading source: git-dump-2.dat | 63 sorting... |
| 68 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 64 converting... |
| 69 Done commit of rev 0 | 65 3 added Makefile |
| 70 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 66 2 create branch 'REL-2-2-3' (manufactured commit) |
| 71 Done commit of rev 1 | 67 1 create tag 'REL-2-2-3-P1' (manufactured commit) |
| 72 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 68 0 added iostream.h |
| 73 Done commit of rev 2 | |
| 74 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 75 Done commit of rev 3 | |
| 76 updating tags | 69 updating tags |
| 77 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 78 Removing blob dir 'HGTMP/test-fastimport-cvs2git-fixup/realcvs.2/.hg/blobs' ... | 70 Removing blob dir 'HGTMP/test-fastimport-cvs2git-fixup/realcvs.2/.hg/blobs' ... |
| 79 % hg glog (git-dump-2.dat) | 71 % hg glog (git-dump-2.dat) |
| 80 @ rev: 4 | 72 o rev: 4 |
| 81 | author: convert-repo | 73 | author: convert-repo |
| 82 | branch: '' tags: tip | 74 | branch: '' tags: tip |
| 83 | files: .hgtags | 75 | files: .hgtags |
| 84 | desc: update tags | 76 | desc: update tags |
| 85 | | 77 | |
| 88 | branch: '' tags: | 80 | branch: '' tags: |
| 89 | files: main.cpp | 81 | files: main.cpp |
| 90 | desc: added iostream.h | 82 | desc: added iostream.h |
| 91 | | 83 | |
| 92 | o rev: 2 | 84 | o rev: 2 |
| 93 | | author: cvs2git <cvs2git> | 85 | | author: cvs2git |
| 94 | | branch: 'REL-2-2-3' tags: REL-2-2-3-P1 | 86 | | branch: 'REL-2-2-3' tags: REL-2-2-3-P1 |
| 95 | | files: Tools/Debug/C++/DebugCpp.doxygen | 87 | | files: Tools/Debug/C++/DebugCpp.doxygen |
| 96 | | desc: create tag 'REL-2-2-3-P1' (manufactured commit) | 88 | | desc: create tag 'REL-2-2-3-P1' (manufactured commit) |
| 97 | | | 89 | | |
| 98 | o rev: 1 | 90 | o rev: 1 |
| 99 |/ author: cvs2git <cvs2git> | 91 |/ author: cvs2git |
| 100 | branch: 'REL-2-2-3' tags: | 92 | branch: 'REL-2-2-3' tags: |
| 101 | files: | 93 | files: |
| 102 | desc: create branch 'REL-2-2-3' (manufactured commit) | 94 | desc: create branch 'REL-2-2-3' (manufactured commit) |
| 103 | | 95 | |
| 104 o rev: 0 | 96 o rev: 0 |
| 106 branch: '' tags: | 98 branch: '' tags: |
| 107 files: Makefile | 99 files: Makefile |
| 108 desc: added Makefile | 100 desc: added Makefile |
| 109 | 101 |
| 110 % hg branches (git-dump-2.dat) | 102 % hg branches (git-dump-2.dat) |
| 111 REL-2-2-3 2:9c706dffba0e | 103 REL-2-2-3 2:b4709b6ae328 |
| 112 % hg heads -v (git-dump-2.dat) | 104 % hg heads -v (git-dump-2.dat) |
| 113 rev: 4 | 105 rev: 4 |
| 114 author: convert-repo | 106 author: convert-repo |
| 115 branch: '' tags: tip | 107 branch: '' tags: tip |
| 116 files: .hgtags | 108 files: .hgtags |
| 117 desc: update tags | 109 desc: update tags |
| 118 | 110 |
| 119 rev: 2 | 111 rev: 2 |
| 120 author: cvs2git <cvs2git> | 112 author: cvs2git |
| 121 branch: 'REL-2-2-3' tags: REL-2-2-3-P1 | 113 branch: 'REL-2-2-3' tags: REL-2-2-3-P1 |
| 122 files: Tools/Debug/C++/DebugCpp.doxygen | 114 files: Tools/Debug/C++/DebugCpp.doxygen |
| 123 desc: create tag 'REL-2-2-3-P1' (manufactured commit) | 115 desc: create tag 'REL-2-2-3-P1' (manufactured commit) |
| 124 | 116 |
| 125 % hg tags -v (git-dump-2.dat) | 117 % hg tags -v (git-dump-2.dat) |
| 126 REL-2-2-3-P1 2:9c706dffba0e | 118 REL-2-2-3-P1 2:b4709b6ae328 |