Mercurial > hg

changeset 18262:ed923a2d5ae9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update test-convert-cvs*.t The preceding commit caused their outputs to change.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 08 Jan 2013 15:43:48 -0800
parents 1b7b5975793f
children 9aa6bee6e9f9
files tests/test-convert-cvs-synthetic.t tests/test-convert-cvs.t
diffstat 2 files changed, 37 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-convert-cvs-synthetic.t	Tue Jan 08 20:11:20 2013 +0000
+++ b/tests/test-convert-cvs-synthetic.t	Tue Jan 08 15:43:48 2013 -0800
@@ -140,32 +140,35 @@
   collecting CVS rlog
   15 log entries
   creating changesets
-  8 changeset entries
+  9 changeset entries
   sorting...
   converting...
-  7 add file1 on trunk
-  6 add file2
-  5 add file3, file4 on branch v1_1
-  4 MERGE from v1_0: add file2
+  8 add file1 on trunk
+  7 add file2
+  6 MERGE from v1_0: add file2
+  5 file file3 was initially added on branch v1_1.
+  4 add file3, file4 on branch v1_1
   3 add file5 on v1_2
   2 add file6 on trunk post-v1_2
-  1 MERGE from v1_2: add file5
-  0 MERGE from HEAD: add file6
+  1 MERGE from HEAD: add file6
+  0 MERGE from v1_2: add file5
 
 hg glog output (#1)
 
   $ hg -R proj.hg glog --template "{rev} {desc}\n"
-  o  7 MERGE from HEAD: add file6
+  o  8 MERGE from v1_2: add file5
   |
-  | o  6 MERGE from v1_2: add file5
+  | o  7 MERGE from HEAD: add file6
   | |
-  | o  5 add file6 on trunk post-v1_2
+  o |  6 add file6 on trunk post-v1_2
   | |
-  o |  4 add file5 on v1_2
-  |/
-  | o  3 MERGE from v1_0: add file2
+  | o  5 add file5 on v1_2
   | |
-  | o  2 add file3, file4 on branch v1_1
+  | | o  4 add file3, file4 on branch v1_1
+  | | |
+  o | |  3 file file3 was initially added on branch v1_1.
+  |/ /
+  | o  2 MERGE from v1_0: add file2
   |/
   | o  1 add file2
   |/
@@ -184,32 +187,35 @@
   collecting CVS rlog
   15 log entries
   creating changesets
-  8 changeset entries
+  9 changeset entries
   sorting...
   converting...
-  7 add file1 on trunk
-  6 add file2
-  5 add file3, file4 on branch v1_1
-  4 MERGE from v1_0: add file2
+  8 add file1 on trunk
+  7 add file2
+  6 MERGE from v1_0: add file2
+  5 file file3 was initially added on branch v1_1.
+  4 add file3, file4 on branch v1_1
   3 add file5 on v1_2
   2 add file6 on trunk post-v1_2
-  1 MERGE from v1_2: add file5
-  0 MERGE from HEAD: add file6
+  1 MERGE from HEAD: add file6
+  0 MERGE from v1_2: add file5
 
 hg glog output (#2)
 
   $ hg -R proj.hg2 glog --template "{rev} {desc}\n"
-  o  7 MERGE from HEAD: add file6
+  o  8 MERGE from v1_2: add file5
   |
-  | o  6 MERGE from v1_2: add file5
+  | o  7 MERGE from HEAD: add file6
   | |
-  | o  5 add file6 on trunk post-v1_2
+  o |  6 add file6 on trunk post-v1_2
   | |
-  o |  4 add file5 on v1_2
-  |/
-  | o  3 MERGE from v1_0: add file2
+  | o  5 add file5 on v1_2
   | |
-  | o  2 add file3, file4 on branch v1_1
+  | | o  4 add file3, file4 on branch v1_1
+  | | |
+  o | |  3 file file3 was initially added on branch v1_1.
+  |/ /
+  | o  2 MERGE from v1_0: add file2
   |/
   | o  1 add file2
   |/
--- a/tests/test-convert-cvs.t	Tue Jan 08 20:11:20 2013 +0000
+++ b/tests/test-convert-cvs.t	Tue Jan 08 15:43:48 2013 -0800
@@ -395,12 +395,11 @@
   Author: * (glob)
   Branch: HEAD
   Tag: (none) 
-  Branchpoints: branch 
   Log:
   ci1
   
   Members: 
-  	a:1.1->1.2 
+  	b/c:1.2->1.3 
   
   ---------------------
   PatchSet 6 
@@ -408,11 +407,12 @@
   Author: * (glob)
   Branch: HEAD
   Tag: (none) 
+  Branchpoints: branch 
   Log:
   ci1
   
   Members: 
-  	b/c:1.2->1.3 
+  	a:1.1->1.2 
   
   ---------------------
   PatchSet 7