diff tests/test-convert-cvs.out @ 9602:fc493cb90bb1

Merge with redone c655432c2c24 (issue1860)

--- a/tests/test-convert-cvs.out	Fri Oct 16 11:18:38 2009 +0200
+++ b/tests/test-convert-cvs.out	Fri Oct 16 11:19:39 2009 +0200
@@ -12,10 +12,13 @@
 % commit a new revision changing b/c
 checking in src/b/c,v
 % convert fresh repo
-warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
 initializing destination src-hg repository
 connecting to cvsrepo
 scanning source...
+collecting CVS rlog
+5 log entries
+creating changesets
+3 changeset entries
 sorting...
 converting...
 2 Initial revision
@@ -26,10 +29,13 @@
 c
 c
 % convert fresh repo with --filemap
-warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
 initializing destination src-filemap repository
 connecting to cvsrepo
 scanning source...
+collecting CVS rlog
+5 log entries
+creating changesets
+3 changeset entries
 sorting...
 converting...
 2 Initial revision
@@ -47,9 +53,12 @@
 checking in src/a,v
 checking in src/b/c,v
 % convert again
-warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
 connecting to cvsrepo
 scanning source...
+collecting CVS rlog
+7 log entries
+creating changesets
+4 changeset entries
 sorting...
 converting...
 0 ci1
@@ -59,9 +68,12 @@
 c
 c
 % convert again with --filemap
-warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
 connecting to cvsrepo
 scanning source...
+collecting CVS rlog
+7 log entries
+creating changesets
+4 changeset entries
 sorting...
 converting...
 0 ci1
@@ -78,19 +90,24 @@
 T b/c
 checking in src/b/c,v
 % convert again
-warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
 connecting to cvsrepo
 scanning source...
+collecting CVS rlog
+8 log entries
+creating changesets
+5 changeset entries
 sorting...
 converting...
 0 ci2
-a
 c
 d
 % convert again with --filemap
-warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
 connecting to cvsrepo
 scanning source...
+collecting CVS rlog
+8 log entries
+creating changesets
+5 changeset entries
 sorting...
 converting...
 0 ci2
@@ -101,15 +118,137 @@
 2 update tags files: .hgtags
 1 ci0 files: b/c
 0 Initial revision files: b/c
+% commit a new revision with funny log message
+checking in src/a,v
+% convert again
+connecting to cvsrepo
+scanning source...
+collecting CVS rlog
+9 log entries
+creating changesets
+6 changeset entries
+sorting...
+converting...
+0 funny
+o  6 (branch) funny
+|  ----------------------------
+|  log message files: a
 o  5 (branch) ci2 files: b/c
+
+o  4 () ci1 files: a b/c
 |
-| o  4 () ci1 files: a b/c
-| |
-| o  3 () update tags files: .hgtags
-| |
-| o  2 () ci0 files: b/c
-|/
+o  3 () update tags files: .hgtags
+|
+o  2 () ci0 files: b/c
+|
 | o  1 (INITIAL) import files:
 |/
 o  0 () Initial revision files: a b/c
 
+% testing debugcvsps
+collecting CVS rlog
+9 log entries
+creating changesets
+8 changeset entries
+---------------------
+PatchSet 1 
+Date:
+Author:
+Branch: HEAD
+Tag: (none) 
+Branchpoints: INITIAL 
+Log:
+Initial revision
+
+Members: 
+	a:INITIAL->1.1 
+
+---------------------
+PatchSet 2 
+Date:
+Author:
+Branch: HEAD
+Tag: (none) 
+Branchpoints: INITIAL, branch 
+Log:
+Initial revision
+
+Members: 
+	b/c:INITIAL->1.1 
+
+---------------------
+PatchSet 3 
+Date:
+Author:
+Branch: INITIAL
+Tag: start 
+Log:
+import
+
+Members: 
+	a:1.1->1.1.1.1 
+	b/c:1.1->1.1.1.1 
+
+---------------------
+PatchSet 4 
+Date:
+Author:
+Branch: HEAD
+Tag: (none) 
+Log:
+ci0
+
+Members: 
+	b/c:1.1->1.2 
+
+---------------------
+PatchSet 5 
+Date:
+Author:
+Branch: HEAD
+Tag: (none) 
+Branchpoints: branch 
+Log:
+ci1
+
+Members: 
+	a:1.1->1.2 
+
+---------------------
+PatchSet 6 
+Date:
+Author:
+Branch: HEAD
+Tag: (none) 
+Log:
+ci1
+
+Members: 
+	b/c:1.2->1.3 
+
+---------------------
+PatchSet 7 
+Date:
+Author:
+Branch: branch
+Tag: (none) 
+Log:
+ci2
+
+Members: 
+	b/c:1.1->1.1.2.1 
+
+---------------------
+PatchSet 8 
+Date:
+Author:
+Branch: branch
+Tag: (none) 
+Log:
+funny
+----------------------------
+log message
+
+Members: 
+	a:1.2->1.2.2.1 
+