Mercurial > hg > hg-fastimport

view 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
line wrap: on
line source

% import cvs2git with branch/tag
Reading source: git-blob.dat
Reading source: git-dump.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
Removing blob dir 'HGTMP/test-fastimport-cvs2git-fixup/realcvs/.hg/blobs' ...
% hg glog
@  changeset:   3:158529dd7d57
|  tag:         tip
|  parent:      0:8c270455072a
|  user:        Other <other@example.com>
|  date:        Mon May 27 22:01:08 2002 +0000
|  files:       main.cpp
|  description:
|  added iostream.h
|
|
| o  changeset:   2:9c706dffba0e
| |  branch:      REL-2-2-3
| |  user:        cvs2git <cvs2git>
| |  date:        Mon May 27 21:04:55 2002 +0000
| |  files:       Tools/Debug/C++/DebugCpp.doxygen
| |  description:
| |  create tag 'REL-2-2-3-P1' (manufactured commit)
| |
| |
| o  changeset:   1:fd354e4cf420
|/   branch:      REL-2-2-3
|    user:        cvs2git <cvs2git>
|    date:        Mon May 27 21:04:54 2002 +0000
|    description:
|    create branch 'REL-2-2-3' (manufactured commit)
|
|
o  changeset:   0:8c270455072a
   user:        Example <example>
   date:        Wed Jun 06 02:06:20 2001 +0000
   files:       Makefile
   description:
   added Makefile


% hg branches
default                        3:158529dd7d57
REL-2-2-3                      2:9c706dffba0e
% hg heads -v
changeset:   3:158529dd7d57
tag:         tip
parent:      0:8c270455072a
user:        Other <other@example.com>
date:        Mon May 27 22:01:08 2002 +0000
summary:     added iostream.h

changeset:   2:9c706dffba0e
branch:      REL-2-2-3
user:        cvs2git <cvs2git>
date:        Mon May 27 21:04:55 2002 +0000
summary:     create tag 'REL-2-2-3-P1' (manufactured commit)

% hg tags -v
tip                                3:158529dd7d57
REL-2-2-3-P1                       2:9c706dffba0e