annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
45
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
1 ----------------------------------------
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
2 % import git-dump-1.dat
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
3 scanning source...
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
4 sorting...
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
5 converting...
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
6 3 added Makefile
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
7 2 create branch 'REL-2-2-3' (manufactured commit)
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
8 1 create tag 'REL-2-2-3-P1' (manufactured commit)
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
9 0 added iostream.h
42
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
10 updating tags
45
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
11 Removing blob dir 'HGTMP/test-fastimport-cvs2git-fixup/realcvs.1/.hg/blobs' ...
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
12 % hg glog (git-dump-1.dat)
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
13 o rev: 4
42
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
14 | author: convert-repo
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
15 | branch: '' tags: tip
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
16 | files: .hgtags
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
17 | desc: update tags
39
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
18 |
42
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
19 o rev: 3
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
20 | author: Other <other@example.com>
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
21 | branch: '' tags:
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
22 | files: main.cpp
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
23 | desc: added iostream.h
39
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
24 |
42
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
25 | o rev: 2
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
26 | | author: cvs2git
42
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
27 | | branch: 'REL-2-2-3' tags: REL-2-2-3-P1
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
28 | | files: Tools/Debug/C++/DebugCpp.doxygen
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
29 | | desc: create tag 'REL-2-2-3-P1' (manufactured commit)
39
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
30 | |
42
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
31 | o rev: 1
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
32 |/ author: cvs2git
42
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
33 | branch: 'REL-2-2-3' tags:
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
34 | files:
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
35 | desc: create branch 'REL-2-2-3' (manufactured commit)
39
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
36 |
42
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
37 o rev: 0
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
38 author: Example <example>
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
39 branch: '' tags:
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
40 files: Makefile
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
41 desc: added Makefile
39
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
42
45
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
43 % hg branches (git-dump-1.dat)
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
44 REL-2-2-3 2:b4709b6ae328
45
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
45 % hg heads -v (git-dump-1.dat)
42
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
46 rev: 4
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
47 author: convert-repo
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
48 branch: '' tags: tip
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
49 files: .hgtags
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
50 desc: update tags
39
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
51
42
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
52 rev: 2
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
53 author: cvs2git
42
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
54 branch: 'REL-2-2-3' tags: REL-2-2-3-P1
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
55 files: Tools/Debug/C++/DebugCpp.doxygen
71f1e5ed6213 Convert "lightweight" tags, since that's how cvs2git handle CVS tags.
Greg Ward <greg-hg@gerg.ca>
parents: 39
diff changeset
56 desc: create tag 'REL-2-2-3-P1' (manufactured commit)
39
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
57
45
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
58 % hg tags -v (git-dump-1.dat)
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
59 REL-2-2-3-P1 2:b4709b6ae328
45
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
60 ----------------------------------------
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
61 % import git-dump-2.dat
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
62 scanning source...
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
63 sorting...
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
64 converting...
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
65 3 added Makefile
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
66 2 create branch 'REL-2-2-3' (manufactured commit)
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
67 1 create tag 'REL-2-2-3-P1' (manufactured commit)
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
68 0 added iostream.h
45
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
69 updating tags
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
70 Removing blob dir 'HGTMP/test-fastimport-cvs2git-fixup/realcvs.2/.hg/blobs' ...
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
71 % hg glog (git-dump-2.dat)
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
72 o rev: 4
45
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
73 | author: convert-repo
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
74 | branch: '' tags: tip
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
75 | files: .hgtags
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
76 | desc: update tags
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
77 |
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
78 o rev: 3
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
79 | author: Other <other@example.com>
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
80 | branch: '' tags:
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
81 | files: main.cpp
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
82 | desc: added iostream.h
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
83 |
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
84 | o rev: 2
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
85 | | author: cvs2git
45
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
86 | | branch: 'REL-2-2-3' tags: REL-2-2-3-P1
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
87 | | files: Tools/Debug/C++/DebugCpp.doxygen
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
88 | | desc: create tag 'REL-2-2-3-P1' (manufactured commit)
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
89 | |
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
90 | o rev: 1
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
91 |/ author: cvs2git
45
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
92 | branch: 'REL-2-2-3' tags:
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
93 | files:
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
94 | desc: create branch 'REL-2-2-3' (manufactured commit)
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
95 |
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
96 o rev: 0
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
97 author: Example <example>
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
98 branch: '' tags:
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
99 files: Makefile
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
100 desc: added Makefile
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
101
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
102 % hg branches (git-dump-2.dat)
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
103 REL-2-2-3 2:b4709b6ae328
45
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
104 % hg heads -v (git-dump-2.dat)
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
105 rev: 4
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
106 author: convert-repo
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
107 branch: '' tags: tip
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
108 files: .hgtags
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
109 desc: update tags
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
110
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
111 rev: 2
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
112 author: cvs2git
45
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
113 branch: 'REL-2-2-3' tags: REL-2-2-3-P1
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
114 files: Tools/Debug/C++/DebugCpp.doxygen
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
115 desc: create tag 'REL-2-2-3-P1' (manufactured commit)
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
116
783890f8a6fb Test that my idealized version of cvs2git's output produces identical output.
Greg Ward <greg-hg@gerg.ca>
parents: 44
diff changeset
117 % hg tags -v (git-dump-2.dat)
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 45
diff changeset
118 REL-2-2-3-P1 2:b4709b6ae328