diff --git a/tests/test-convert-cvs b/tests/test-convert-cvs --- a/tests/test-convert-cvs +++ b/tests/test-convert-cvs @@ -132,12 +132,22 @@ log message' . | grep '<--' |\ sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' cd .. +echo % commit new file revisions with some fuzz +cd src +echo f >> a +cvscall -q commit -mfuzzy . | grep '<--' |\ + sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' +sleep 4 # the two changes will be split if fuzz < 4 +echo g >> b/c +cvscall -q commit -mfuzzy . | grep '<--' |\ + sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' +cd .. + echo % convert again -hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' +hg convert --config convert.cvsps.fuzz=2 src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' -echo "graphlog = " >> $HGRCPATH hg -R src-hg glog --template '{rev} ({branches}) {desc} files: {files}\n' echo % testing debugcvsps cd src -hg debugcvsps | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/' +hg debugcvsps --fuzz=2 | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/' diff --git a/tests/test-convert-cvs.out b/tests/test-convert-cvs.out --- a/tests/test-convert-cvs.out +++ b/tests/test-convert-cvs.out @@ -150,18 +150,27 @@ 1 ci0 files: b/c 0 Initial revision files: b/c % commit a new revision with funny log message checking in src/a,v +% commit new file revisions with some fuzz +checking in src/a,v +checking in src/b/c,v % convert again connecting to cvsrepo scanning source... collecting CVS rlog -9 log entries -cvslog hook: 9 entries +11 log entries +cvslog hook: 11 entries creating changesets -6 changeset entries -cvschangesets hook: 6 changesets +8 changeset entries +cvschangesets hook: 8 changesets sorting... converting... -0 funny +2 funny +1 fuzzy +0 fuzzy +o 8 (branch) fuzzy files: b/c +| +o 7 (branch) fuzzy files: a +| o 6 (branch) funny | ---------------------------- | log message files: a @@ -179,11 +188,11 @@ o 0 () Initial revision files: a b/c % testing debugcvsps collecting CVS rlog -9 log entries -cvslog hook: 9 entries +11 log entries +cvslog hook: 11 entries creating changesets -8 changeset entries -cvschangesets hook: 8 changesets +10 changeset entries +cvschangesets hook: 10 changesets --------------------- PatchSet 1 Date: @@ -286,3 +295,27 @@ log message Members: a:1.2->1.2.2.1 +--------------------- +PatchSet 9 +Date: +Author: +Branch: branch +Tag: (none) +Log: +fuzzy + +Members: + a:1.2.2.1->1.2.2.2 + +--------------------- +PatchSet 10 +Date: +Author: +Branch: branch +Tag: (none) +Log: +fuzzy + +Members: + b/c:1.1.2.1->1.1.2.2 +