Mercurial > hg > hg-fastimport

comparison tests/test-fastimport-cvs2git-fixup.out @ 45:783890f8a6fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test that my idealized version of cvs2git's output produces identical output.
author Greg Ward <greg-hg@gerg.ca>
date Mon, 11 May 2009 17:55:57 -0400
parents 61ff7b929cea
children 7ff36dc9f0b1
comparison
equal deleted inserted replaced
44:61ff7b929cea 45:783890f8a6fb
1 % import cvs2git with branch/tag 1 ----------------------------------------
2 % import git-dump-1.dat
2 Reading source: git-blob.dat 3 Reading source: git-blob.dat
3 Reading source: git-dump-1.dat 4 Reading source: git-dump-1.dat
4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 5 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 Done commit of rev 0 6 Done commit of rev 0
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9 Done commit of rev 2 10 Done commit of rev 2
10 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 11 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
11 Done commit of rev 3 12 Done commit of rev 3
12 updating tags 13 updating tags
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
14 Removing blob dir 'HGTMP/test-fastimport-cvs2git-fixup/realcvs/.hg/blobs' ... 15 Removing blob dir 'HGTMP/test-fastimport-cvs2git-fixup/realcvs.1/.hg/blobs' ...
15 % hg glog 16 % hg glog (git-dump-1.dat)
16 @ rev: 4 17 @ rev: 4
17 | author: convert-repo 18 | author: convert-repo
18 | branch: '' tags: tip 19 | branch: '' tags: tip
19 | files: .hgtags 20 | files: .hgtags
20 | desc: update tags 21 | desc: update tags
41 author: Example <example> 42 author: Example <example>
42 branch: '' tags: 43 branch: '' tags:
43 files: Makefile 44 files: Makefile
44 desc: added Makefile 45 desc: added Makefile
45 46
46 % hg branches 47 % hg branches (git-dump-1.dat)
47 REL-2-2-3 2:9c706dffba0e 48 REL-2-2-3 2:9c706dffba0e
48 % hg heads -v 49 % hg heads -v (git-dump-1.dat)
49 rev: 4 50 rev: 4
50 author: convert-repo 51 author: convert-repo
51 branch: '' tags: tip 52 branch: '' tags: tip
52 files: .hgtags 53 files: .hgtags
53 desc: update tags 54 desc: update tags
56 author: cvs2git <cvs2git> 57 author: cvs2git <cvs2git>
57 branch: 'REL-2-2-3' tags: REL-2-2-3-P1 58 branch: 'REL-2-2-3' tags: REL-2-2-3-P1
58 files: Tools/Debug/C++/DebugCpp.doxygen 59 files: Tools/Debug/C++/DebugCpp.doxygen
59 desc: create tag 'REL-2-2-3-P1' (manufactured commit) 60 desc: create tag 'REL-2-2-3-P1' (manufactured commit)
60 61
61 % hg tags -v 62 % hg tags -v (git-dump-1.dat)
62 REL-2-2-3-P1 2:9c706dffba0e 63 REL-2-2-3-P1 2:9c706dffba0e
64 ----------------------------------------
65 % import git-dump-2.dat
66 Reading source: git-blob.dat
67 Reading source: git-dump-2.dat
68 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
69 Done commit of rev 0
70 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
71 Done commit of rev 1
72 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
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
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' ...
79 % hg glog (git-dump-2.dat)
80 @ rev: 4
81 | author: convert-repo
82 | branch: '' tags: tip
83 | files: .hgtags
84 | desc: update tags
85 |
86 o rev: 3
87 | author: Other <other@example.com>
88 | branch: '' tags:
89 | files: main.cpp
90 | desc: added iostream.h
91 |
92 | o rev: 2
93 | | author: cvs2git <cvs2git>
94 | | branch: 'REL-2-2-3' tags: REL-2-2-3-P1
95 | | files: Tools/Debug/C++/DebugCpp.doxygen
96 | | desc: create tag 'REL-2-2-3-P1' (manufactured commit)
97 | |
98 | o rev: 1
99 |/ author: cvs2git <cvs2git>
100 | branch: 'REL-2-2-3' tags:
101 | files:
102 | desc: create branch 'REL-2-2-3' (manufactured commit)
103 |
104 o rev: 0
105 author: Example <example>
106 branch: '' tags:
107 files: Makefile
108 desc: added Makefile
109
110 % hg branches (git-dump-2.dat)
111 REL-2-2-3 2:9c706dffba0e
112 % hg heads -v (git-dump-2.dat)
113 rev: 4
114 author: convert-repo
115 branch: '' tags: tip
116 files: .hgtags
117 desc: update tags
118
119 rev: 2
120 author: cvs2git <cvs2git>
121 branch: 'REL-2-2-3' tags: REL-2-2-3-P1
122 files: Tools/Debug/C++/DebugCpp.doxygen
123 desc: create tag 'REL-2-2-3-P1' (manufactured commit)
124
125 % hg tags -v (git-dump-2.dat)
126 REL-2-2-3-P1 2:9c706dffba0e