Mercurial > hg

diff tests/test-convert-cvs-builtincvsps.out @ 8756:6019e6517f95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: better support for CVS branchpoints (issue1447) This records the branches starting at individual CVS file revisions, using the symbolic names map rather than just the branches information. This information is used to generate Mercurial changesets. Despite the changes, the CVS conversion still suffers heavily from cvsps' deficiencies in generating a correct representation of the CVS repository history.
author Henrik Stuart <hg@hstuart.dk>
date Tue, 09 Jun 2009 08:59:49 +0200
parents ba42e3c6e602
children
line wrap: on
line diff
--- a/tests/test-convert-cvs-builtincvsps.out	Mon Jun 08 18:21:13 2009 -0500
+++ b/tests/test-convert-cvs-builtincvsps.out	Tue Jun 09 08:59:49 2009 +0200
@@ -104,7 +104,6 @@
 sorting...
 converting...
 0 ci2
-a
 c
 d
 % convert again with --filemap
@@ -142,13 +141,13 @@
 |  ----------------------------
 |  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
@@ -157,22 +156,35 @@
 collecting CVS rlog
 9 log entries
 creating changesets
-6 changeset entries
+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 2 
+PatchSet 3 
 Date:
 Author:
 Branch: INITIAL
@@ -185,7 +197,7 @@
 	b/c:1.1->1.1.1.1 
 
 ---------------------
-PatchSet 3 
+PatchSet 4 
 Date:
 Author:
 Branch: HEAD
@@ -197,7 +209,20 @@
 	b/c:1.1->1.2 
 
 ---------------------
-PatchSet 4 
+PatchSet 5 
+Date:
+Author:
+Branch: HEAD
+Tag: (none) 
+Branchpoints: branch 
+Log:
+ci1
+
+Members: 
+	a:1.1->1.2 
+
+---------------------
+PatchSet 6 
 Date:
 Author:
 Branch: HEAD
@@ -206,11 +231,10 @@
 ci1
 
 Members: 
-	a:1.1->1.2 
 	b/c:1.2->1.3 
 
 ---------------------
-PatchSet 5 
+PatchSet 7 
 Date:
 Author:
 Branch: branch
@@ -222,7 +246,7 @@
 	b/c:1.1->1.1.2.1 
 
 ---------------------
-PatchSet 6 
+PatchSet 8 
 Date:
 Author:
 Branch: branch