Mercurial > hg > hg-fastimport
comparison tests/test-fastimport-cvs2git-fixup.out @ 39:177a133519bc
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 |
comparison
equal
deleted
inserted
replaced
| 38:3048a2dcf68a | 39:177a133519bc |
|---|---|
| 1 % import cvs2git with branch/tag | |
| 2 Reading source: git-blob.dat | |
| 3 Reading source: git-dump.dat | |
| 4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 5 Done commit of rev 0 | |
| 6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 7 Done commit of rev 1 | |
| 8 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 9 Done commit of rev 2 | |
| 10 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 11 Done commit of rev 3 | |
| 12 Removing blob dir 'HGTMP/test-fastimport-cvs2git-fixup/realcvs/.hg/blobs' ... | |
| 13 % hg glog | |
| 14 @ changeset: 3:158529dd7d57 | |
| 15 | tag: tip | |
| 16 | parent: 0:8c270455072a | |
| 17 | user: Other <other@example.com> | |
| 18 | date: Mon May 27 22:01:08 2002 +0000 | |
| 19 | files: main.cpp | |
| 20 | description: | |
| 21 | added iostream.h | |
| 22 | | |
| 23 | | |
| 24 | o changeset: 2:9c706dffba0e | |
| 25 | | branch: REL-2-2-3 | |
| 26 | | user: cvs2git <cvs2git> | |
| 27 | | date: Mon May 27 21:04:55 2002 +0000 | |
| 28 | | files: Tools/Debug/C++/DebugCpp.doxygen | |
| 29 | | description: | |
| 30 | | create tag 'REL-2-2-3-P1' (manufactured commit) | |
| 31 | | | |
| 32 | | | |
| 33 | o changeset: 1:fd354e4cf420 | |
| 34 |/ branch: REL-2-2-3 | |
| 35 | user: cvs2git <cvs2git> | |
| 36 | date: Mon May 27 21:04:54 2002 +0000 | |
| 37 | description: | |
| 38 | create branch 'REL-2-2-3' (manufactured commit) | |
| 39 | | |
| 40 | | |
| 41 o changeset: 0:8c270455072a | |
| 42 user: Example <example> | |
| 43 date: Wed Jun 06 02:06:20 2001 +0000 | |
| 44 files: Makefile | |
| 45 description: | |
| 46 added Makefile | |
| 47 | |
| 48 | |
| 49 % hg branches | |
| 50 default 3:158529dd7d57 | |
| 51 REL-2-2-3 2:9c706dffba0e | |
| 52 % hg heads -v | |
| 53 changeset: 3:158529dd7d57 | |
| 54 tag: tip | |
| 55 parent: 0:8c270455072a | |
| 56 user: Other <other@example.com> | |
| 57 date: Mon May 27 22:01:08 2002 +0000 | |
| 58 summary: added iostream.h | |
| 59 | |
| 60 changeset: 2:9c706dffba0e | |
| 61 branch: REL-2-2-3 | |
| 62 user: cvs2git <cvs2git> | |
| 63 date: Mon May 27 21:04:55 2002 +0000 | |
| 64 summary: create tag 'REL-2-2-3-P1' (manufactured commit) | |
| 65 | |
| 66 % hg tags -v | |
| 67 tip 3:158529dd7d57 | |
| 68 REL-2-2-3-P1 2:9c706dffba0e |