Mercurial > hg > hg-fastimport
diff 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 |
line wrap: on
line diff
--- a/tests/test-fastimport-cvs2git-fixup.out Sun May 10 14:16:02 2009 -0400 +++ b/tests/test-fastimport-cvs2git-fixup.out Sat May 16 12:57:22 2009 -0400 @@ -1,20 +1,16 @@ ---------------------------------------- % import git-dump-1.dat -Reading source: git-blob.dat -Reading source: git-dump-1.dat -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -Done commit of rev 0 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -Done commit of rev 1 -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -Done commit of rev 2 -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -Done commit of rev 3 +scanning source... +sorting... +converting... +3 added Makefile +2 create branch 'REL-2-2-3' (manufactured commit) +1 create tag 'REL-2-2-3-P1' (manufactured commit) +0 added iostream.h updating tags -1 files updated, 0 files merged, 0 files removed, 0 files unresolved Removing blob dir 'HGTMP/test-fastimport-cvs2git-fixup/realcvs.1/.hg/blobs' ... % hg glog (git-dump-1.dat) -@ rev: 4 +o rev: 4 | author: convert-repo | branch: '' tags: tip | files: .hgtags @@ -27,13 +23,13 @@ | desc: added iostream.h | | o rev: 2 -| | author: cvs2git <cvs2git> +| | author: cvs2git | | branch: 'REL-2-2-3' tags: REL-2-2-3-P1 | | files: Tools/Debug/C++/DebugCpp.doxygen | | desc: create tag 'REL-2-2-3-P1' (manufactured commit) | | | o rev: 1 -|/ author: cvs2git <cvs2git> +|/ author: cvs2git | branch: 'REL-2-2-3' tags: | files: | desc: create branch 'REL-2-2-3' (manufactured commit) @@ -45,7 +41,7 @@ desc: added Makefile % hg branches (git-dump-1.dat) -REL-2-2-3 2:9c706dffba0e +REL-2-2-3 2:b4709b6ae328 % hg heads -v (git-dump-1.dat) rev: 4 author: convert-repo @@ -54,30 +50,26 @@ desc: update tags rev: 2 -author: cvs2git <cvs2git> +author: cvs2git branch: 'REL-2-2-3' tags: REL-2-2-3-P1 files: Tools/Debug/C++/DebugCpp.doxygen desc: create tag 'REL-2-2-3-P1' (manufactured commit) % hg tags -v (git-dump-1.dat) -REL-2-2-3-P1 2:9c706dffba0e +REL-2-2-3-P1 2:b4709b6ae328 ---------------------------------------- % import git-dump-2.dat -Reading source: git-blob.dat -Reading source: git-dump-2.dat -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -Done commit of rev 0 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -Done commit of rev 1 -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -Done commit of rev 2 -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -Done commit of rev 3 +scanning source... +sorting... +converting... +3 added Makefile +2 create branch 'REL-2-2-3' (manufactured commit) +1 create tag 'REL-2-2-3-P1' (manufactured commit) +0 added iostream.h updating tags -1 files updated, 0 files merged, 0 files removed, 0 files unresolved Removing blob dir 'HGTMP/test-fastimport-cvs2git-fixup/realcvs.2/.hg/blobs' ... % hg glog (git-dump-2.dat) -@ rev: 4 +o rev: 4 | author: convert-repo | branch: '' tags: tip | files: .hgtags @@ -90,13 +82,13 @@ | desc: added iostream.h | | o rev: 2 -| | author: cvs2git <cvs2git> +| | author: cvs2git | | branch: 'REL-2-2-3' tags: REL-2-2-3-P1 | | files: Tools/Debug/C++/DebugCpp.doxygen | | desc: create tag 'REL-2-2-3-P1' (manufactured commit) | | | o rev: 1 -|/ author: cvs2git <cvs2git> +|/ author: cvs2git | branch: 'REL-2-2-3' tags: | files: | desc: create branch 'REL-2-2-3' (manufactured commit) @@ -108,7 +100,7 @@ desc: added Makefile % hg branches (git-dump-2.dat) -REL-2-2-3 2:9c706dffba0e +REL-2-2-3 2:b4709b6ae328 % hg heads -v (git-dump-2.dat) rev: 4 author: convert-repo @@ -117,10 +109,10 @@ desc: update tags rev: 2 -author: cvs2git <cvs2git> +author: cvs2git branch: 'REL-2-2-3' tags: REL-2-2-3-P1 files: Tools/Debug/C++/DebugCpp.doxygen desc: create tag 'REL-2-2-3-P1' (manufactured commit) % hg tags -v (git-dump-2.dat) -REL-2-2-3-P1 2:9c706dffba0e +REL-2-2-3-P1 2:b4709b6ae328