Mercurial > hg > hg-fastimport

annotate tests/test-fastimport-cvs2git-fixup.out @ 39:177a133519bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle fixup branches for tag/branch creation better. - ensure that fixup commits actually become Mercurial changesets (rather than dropping them on the floor) - pretend that fixup commits happen on the same branch as the previous commit - don't track fixup commits as branch heads - add test-fastimport-cvs2git-fixup (currently failing because tags are not converted)
author Greg Ward <greg-hg@gerg.ca>
date Sat, 09 May 2009 18:52:33 -0400
parents
children 71f1e5ed6213
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
39
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
1 % import cvs2git with branch/tag
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
2 Reading source: git-blob.dat
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
3 Reading source: git-dump.dat
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
5 Done commit of rev 0
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
7 Done commit of rev 1
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
8 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
9 Done commit of rev 2
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
10 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
11 Done commit of rev 3
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
12 Removing blob dir 'HGTMP/test-fastimport-cvs2git-fixup/realcvs/.hg/blobs' ...
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
13 % hg glog
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
14 @ changeset: 3:158529dd7d57
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
15 | tag: tip
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
16 | parent: 0:8c270455072a
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
17 | user: Other <other@example.com>
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
18 | date: Mon May 27 22:01:08 2002 +0000
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
19 | files: main.cpp
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
20 | description:
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
21 | added iostream.h
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
22 |
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
23 |
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
24 | o changeset: 2:9c706dffba0e
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
25 | | branch: REL-2-2-3
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
26 | | user: cvs2git <cvs2git>
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
27 | | date: Mon May 27 21:04:55 2002 +0000
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
28 | | files: Tools/Debug/C++/DebugCpp.doxygen
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
29 | | description:
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
30 | | create tag 'REL-2-2-3-P1' (manufactured commit)
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
31 | |
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
32 | |
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
33 | o changeset: 1:fd354e4cf420
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
34 |/ branch: REL-2-2-3
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
35 | user: cvs2git <cvs2git>
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
36 | date: Mon May 27 21:04:54 2002 +0000
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
37 | description:
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
38 | create branch 'REL-2-2-3' (manufactured commit)
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
39 |
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
40 |
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
41 o changeset: 0:8c270455072a
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
42 user: Example <example>
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
43 date: Wed Jun 06 02:06:20 2001 +0000
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
44 files: Makefile
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
45 description:
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
46 added Makefile
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
47
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
48
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
49 % hg branches
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
50 default 3:158529dd7d57
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
51 REL-2-2-3 2:9c706dffba0e
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
52 % hg heads -v
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
53 changeset: 3:158529dd7d57
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
54 tag: tip
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
55 parent: 0:8c270455072a
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
56 user: Other <other@example.com>
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
57 date: Mon May 27 22:01:08 2002 +0000
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
58 summary: added iostream.h
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
59
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
60 changeset: 2:9c706dffba0e
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
61 branch: REL-2-2-3
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
62 user: cvs2git <cvs2git>
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
63 date: Mon May 27 21:04:55 2002 +0000
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
64 summary: create tag 'REL-2-2-3-P1' (manufactured commit)
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
65
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
66 % hg tags -v
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
67 tip 3:158529dd7d57
177a133519bc Handle fixup branches for tag/branch creation better.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
68 REL-2-2-3-P1 2:9c706dffba0e