Mercurial > hg
comparison tests/test-convert-cvsnt-mergepoints.rlog @ 8818:727f7aaefaab
Rename CVSNT "mergepoints" test and make it executable.
- rename test-convert-cvs-builtincvsps-cvsnt-mergepoints
(and related files) to test-convert-cvsnt-mergepoints
- this ensures that the test will be run, but does NOT make
it pass: in particularly, it fails regularly for me due
to the inconsistent behaviour of CVS itself
- expect "Branchpoints:" in debugcvsps output
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 15 Jun 2009 20:35:19 -0400 |
parents | tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints.rlog@3e7611a83230 |
children |
comparison
equal
deleted
inserted
replaced
8817:6c9dce20ed70 | 8818:727f7aaefaab |
---|---|
1 head: 1.2 | |
2 branch: | |
3 locks: strict | |
4 access list: | |
5 symbolic names: | |
6 MYBRANCH1_2: 1.1.2.2.0.2 | |
7 MYBRANCH1_1: 1.1.0.4 | |
8 MYBRANCH1: 1.1.0.2 | |
9 keyword substitution: kv | |
10 total revisions: 8; selected revisions: 8 | |
11 description: | |
12 ---------------------------- | |
13 revision 1.2 | |
14 date: 2009/04/02 07:00:32; author: user; state: Exp; lines: +1 -1; kopt: kv; commitid: 14d449d462903487; mergepoint: 1.1.2.2.2.1; filename: foo.txt; | |
15 merge | |
16 ---------------------------- | |
17 revision 1.1 | |
18 date: 2009/04/02 06:50:43; author: user; state: Exp; kopt: kv; commitid: 17ac49d460432d04; filename: foo.txt; | |
19 branches: 1.1.2; 1.1.4; | |
20 foo.txt | |
21 ---------------------------- | |
22 revision 1.1.4.2 | |
23 date: 2009/04/02 07:02:51; author: user; state: Exp; lines: +1 -0; kopt: kv; commitid: 170049d4631b364d; mergepoint: 1.1.2.2; filename: foo.txt; | |
24 merge | |
25 ---------------------------- | |
26 revision 1.1.4.1 | |
27 date: 2009/04/02 06:53:42; author: user; state: Exp; lines: +1 -1; kopt: kv; commitid: dc849d460f52f49; filename: foo.txt; | |
28 quux | |
29 ---------------------------- | |
30 revision 1.1.2.2 | |
31 date: 2009/04/02 06:53:20; author: user; state: Exp; lines: +1 -1; kopt: kv; commitid: 8ec49d460e02f04; filename: foo.txt; | |
32 branches: 1.1.2.2.2; | |
33 baz | |
34 ---------------------------- | |
35 revision 1.1.2.1 | |
36 date: 2009/04/02 06:52:38; author: user; state: Exp; lines: +1 -1; kopt: kv; commitid: d5049d460b62e7b; filename: foo.txt; | |
37 bar | |
38 ---------------------------- | |
39 revision 1.1.2.2.2.1 | |
40 date: 2009/04/02 06:55:42; author: user; state: Exp; lines: +1 -1; kopt: kv; commitid: 11c849d4616d30d1; filename: foo.txt; | |
41 bazzie | |
42 ============================================================================= |