##// END OF EJS Templates
CVS convert: Find correct parent for new branch (issue704)...
CVS convert: Find correct parent for new branch (issue704) Previously the parent was determined by the last changeset where the branched file was changed even if the branch is based on an earlier revision. Fix written by mpm.

File last commit:

r5920:5df7cb79 default
r5920:5df7cb79 default
Show More
test-convert-cvs.out
113 lines | 1.8 KiB | text/plain | TextLexer
/ tests / test-convert-cvs.out
Patrick Mezard
convert: test cvs repository conversion
r5307 % create cvs repository
% create source directory
% import source directory
N src/a
N src/b/c
No conflicts created by this import
% checkout source directory
U src/a
U src/b/c
Alexis S. L. Carvalho
convert_cvs: add --filemap support
r5381 % commit a new revision changing b/c
checking in src/b/c,v
Patrick Mezard
convert: test cvs repository conversion
r5307 % convert fresh repo
Patrick Mezard
Merge with crew-stable
r5308 initializing destination src-hg repository
Patrick Mezard
convert: test cvs repository conversion
r5307 connecting to cvsrepo
scanning source...
sorting...
converting...
Alexis S. L. Carvalho
convert_cvs: add --filemap support
r5381 2 Initial revision
1 import
0 ci0
Patrick Mezard
convert: test cvs repository conversion
r5307 updating tags
a
c
Alexis S. L. Carvalho
convert_cvs: add --filemap support
r5381 c
% convert fresh repo with --filemap
initializing destination src-filemap repository
connecting to cvsrepo
scanning source...
sorting...
converting...
2 Initial revision
1 import
rolling back last transaction
0 ci0
updating tags
c
c
2 update tags files: .hgtags
1 ci0 files: b/c
0 Initial revision files: b/c
Patrick Mezard
convert: test cvs repository conversion
r5307 % commit new file revisions
Christian Ebert
test-convert-cvs: handle older cvs client
r5364 checking in src/a,v
checking in src/b/c,v
Patrick Mezard
convert: test cvs repository conversion
r5307 % convert again
Patrick Mezard
Merge with crew-stable
r5308 destination src-hg is a Mercurial repository
Patrick Mezard
convert: test cvs repository conversion
r5307 connecting to cvsrepo
scanning source...
sorting...
converting...
0 ci1
a
a
c
c
Alexis S. L. Carvalho
convert_cvs: add --filemap support
r5381 c
% convert again with --filemap
destination src-filemap is a Mercurial repository
connecting to cvsrepo
scanning source...
sorting...
converting...
0 ci1
c
c
c
3 ci1 files: b/c
2 update tags files: .hgtags
1 ci0 files: b/c
0 Initial revision files: b/c
Thomas Arendsen Hein
Test for converting a CVS branch
r5919 % commit branch
U b/c
T a
T b/c
checking in src/b/c,v
% convert again
destination src-hg is a Mercurial repository
connecting to cvsrepo
scanning source...
sorting...
converting...
0 ci2
a
a
c
d
% convert again with --filemap
destination src-filemap is a Mercurial repository
connecting to cvsrepo
scanning source...
sorting...
converting...
0 ci2
c
d
4 ci2 files: b/c
3 ci1 files: b/c
2 update tags files: .hgtags
1 ci0 files: b/c
0 Initial revision files: b/c
o 5 (branch) ci2 files: b/c
|
Thomas Arendsen Hein
CVS convert: Find correct parent for new branch (issue704)...
r5920 | o 4 () ci1 files: a b/c
| |
| o 3 () update tags files: .hgtags
| |
| o 2 () ci0 files: b/c
|/
Thomas Arendsen Hein
Test for converting a CVS branch
r5919 | o 1 (INITIAL) import files:
|/
o 0 () Initial revision files: a b/c