Mercurial > hg
annotate tests/test-convert-cvs-synthetic.t @ 12748:d10369fefd01
alias: fail gracefully when invalid global options are given (issue2442)
This patch modifies the check for shell aliases to prevent crashing when an invalid
global option is given.
When an invalid global option is given the check will simply return and let the
normal error handling for this case happen.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Sun, 17 Oct 2010 13:24:37 -0400 |
parents | 6cc4b14fb76b |
children | c4f271293134 |
rev | line source |
---|---|
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
1 This feature requires use of builtin cvsps! |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
2 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
3 $ "$TESTDIR/hghave" cvs || exit 80 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
4 $ echo "[extensions]" >> $HGRCPATH |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
5 $ echo "convert = " >> $HGRCPATH |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
6 $ echo "graphlog = " >> $HGRCPATH |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
7 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
8 create cvs repository with one project |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
9 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
10 $ mkdir cvsrepo |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
11 $ cd cvsrepo |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
12 $ CVSROOT=`pwd` |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
13 $ export CVSROOT |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
14 $ CVS_OPTIONS=-f |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
15 $ export CVS_OPTIONS |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
16 $ cd .. |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
17 $ cvscall() |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
18 > { |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
19 > cvs -f "$@" |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
20 > } |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
21 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
22 output of 'cvs ci' varies unpredictably, so just discard it |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
23 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
24 $ cvsci() |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
25 > { |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
26 > cvs -f ci "$@" >/dev/null |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
27 > } |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
28 $ cvscall -d "$CVSROOT" init |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
29 $ mkdir cvsrepo/proj |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
30 $ cvscall -q co proj |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
31 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
32 create file1 on the trunk |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
33 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
34 $ cd proj |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
35 $ touch file1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
36 $ cvscall -Q add file1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
37 $ cvsci -m"add file1 on trunk" file1 |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
38 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
39 create two branches |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
40 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
41 $ cvscall -q tag -b v1_0 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
42 T file1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
43 $ cvscall -q tag -b v1_1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
44 T file1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
45 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
46 create file2 on branch v1_0 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
47 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
48 $ cvscall -Q up -rv1_0 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
49 $ touch file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
50 $ cvscall -Q add file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
51 $ cvsci -m"add file2" file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
52 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
53 create file3, file4 on branch v1_1 |
8081
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7862
diff
changeset
|
54 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
55 $ cvscall -Q up -rv1_1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
56 $ touch file3 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
57 $ touch file4 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
58 $ cvscall -Q add file3 file4 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
59 $ cvsci -m"add file3, file4 on branch v1_1" file3 file4 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
60 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
61 merge file2 from v1_0 to v1_1 |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
62 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
63 $ cvscall -Q up -jv1_0 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
64 $ cvsci -m"MERGE from v1_0: add file2" |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
65 cvs commit: Examining . |
8081
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7862
diff
changeset
|
66 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
67 Step things up a notch: now we make the history really hairy, with |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
68 changes bouncing back and forth between trunk and v1_2 and merges |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
69 going both ways. (I.e., try to model the real world.) |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
70 create branch v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
71 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
72 $ cvscall -Q up -A |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
73 $ cvscall -q tag -b v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
74 T file1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
75 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
76 create file5 on branch v1_2 |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
77 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
78 $ cvscall -Q up -rv1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
79 $ touch file5 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
80 $ cvs -Q add file5 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
81 $ cvsci -m"add file5 on v1_2" |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
82 cvs commit: Examining . |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
83 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
84 create file6 on trunk post-v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
85 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
86 $ cvscall -Q up -A |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
87 $ touch file6 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
88 $ cvscall -Q add file6 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
89 $ cvsci -m"add file6 on trunk post-v1_2" |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
90 cvs commit: Examining . |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
91 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
92 merge file5 from v1_2 to trunk |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
93 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
94 $ cvscall -Q up -A |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
95 $ cvscall -Q up -jv1_2 file5 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
96 $ cvsci -m"MERGE from v1_2: add file5" |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
97 cvs commit: Examining . |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
98 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
99 merge file6 from trunk to v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
100 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
101 $ cvscall -Q up -rv1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
102 $ cvscall up -jHEAD file6 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
103 U file6 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
104 $ cvsci -m"MERGE from HEAD: add file6" |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
105 cvs commit: Examining . |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
106 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
107 cvs rlog output |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
108 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
109 $ cvscall -q rlog proj | egrep '^(RCS file|revision)' |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
110 RCS file: $TESTTMP/cvsrepo/proj/file1,v |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
111 revision 1.1 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
112 RCS file: $TESTTMP/cvsrepo/proj/Attic/file2,v |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
113 revision 1.1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
114 revision 1.1.4.2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
115 revision 1.1.4.1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
116 revision 1.1.2.1 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
117 RCS file: $TESTTMP/cvsrepo/proj/Attic/file3,v |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
118 revision 1.1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
119 revision 1.1.2.1 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
120 RCS file: $TESTTMP/cvsrepo/proj/Attic/file4,v |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
121 revision 1.1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
122 revision 1.1.2.1 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
123 RCS file: $TESTTMP/cvsrepo/proj/file5,v |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
124 revision 1.2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
125 revision 1.1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
126 revision 1.1.2.1 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
127 RCS file: $TESTTMP/cvsrepo/proj/file6,v |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
128 revision 1.1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
129 revision 1.1.2.2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
130 revision 1.1.2.1 |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8081
diff
changeset
|
131 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
132 convert to hg (#1) |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8081
diff
changeset
|
133 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
134 $ cd .. |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
135 $ hg convert --datesort proj proj.hg |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
136 initializing destination proj.hg repository |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
137 connecting to $TESTTMP/cvsrepo |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
138 scanning source... |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
139 collecting CVS rlog |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
140 15 log entries |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
141 creating changesets |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
142 8 changeset entries |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
143 sorting... |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
144 converting... |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
145 7 add file1 on trunk |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
146 6 add file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
147 5 add file3, file4 on branch v1_1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
148 4 MERGE from v1_0: add file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
149 3 add file5 on v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
150 2 add file6 on trunk post-v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
151 1 MERGE from v1_2: add file5 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
152 0 MERGE from HEAD: add file6 |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8081
diff
changeset
|
153 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
154 hg glog output (#1) |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8081
diff
changeset
|
155 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
156 $ hg -R proj.hg glog --template "{rev} {desc}\n" |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
157 o 7 MERGE from HEAD: add file6 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
158 | |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
159 | o 6 MERGE from v1_2: add file5 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
160 | | |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
161 | o 5 add file6 on trunk post-v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
162 | | |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
163 o | 4 add file5 on v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
164 |/ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
165 | o 3 MERGE from v1_0: add file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
166 | | |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
167 | o 2 add file3, file4 on branch v1_1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
168 |/ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
169 | o 1 add file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
170 |/ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
171 o 0 add file1 on trunk |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
172 |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8081
diff
changeset
|
173 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
174 convert to hg (#2: with merge detection) |
8081
6c3b8132078e
issue1577: fix broken test by assuming less about CVS output.
Greg Ward <greg-hg@gerg.ca>
parents:
7862
diff
changeset
|
175 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
176 $ hg convert \ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
177 > --config convert.cvsps.mergefrom='"^MERGE from (\S+):"' \ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
178 > --datesort \ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
179 > proj proj.hg2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
180 initializing destination proj.hg2 repository |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12522
diff
changeset
|
181 connecting to $TESTTMP/cvsrepo |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
182 scanning source... |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
183 collecting CVS rlog |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
184 15 log entries |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
185 creating changesets |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
186 8 changeset entries |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
187 sorting... |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
188 converting... |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
189 7 add file1 on trunk |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
190 6 add file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
191 5 add file3, file4 on branch v1_1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
192 4 MERGE from v1_0: add file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
193 3 add file5 on v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
194 2 add file6 on trunk post-v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
195 1 MERGE from v1_2: add file5 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
196 0 MERGE from HEAD: add file6 |
8249
2c7c973c2abd
Reproduce crash where synthetic revs break merge detection (issue1578).
Greg Ward <greg-hg@gerg.ca>
parents:
8081
diff
changeset
|
197 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
198 hg glog output (#2) |
7862
02981000012e
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
199 |
12522
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
200 $ hg -R proj.hg2 glog --template "{rev} {desc}\n" |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
201 o 7 MERGE from HEAD: add file6 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
202 | |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
203 | o 6 MERGE from v1_2: add file5 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
204 | | |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
205 | o 5 add file6 on trunk post-v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
206 | | |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
207 o | 4 add file5 on v1_2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
208 |/ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
209 | o 3 MERGE from v1_0: add file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
210 | | |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
211 | o 2 add file3, file4 on branch v1_1 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
212 |/ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
213 | o 1 add file2 |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
214 |/ |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
215 o 0 add file1 on trunk |
7813e6b44a0b
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com>
parents:
10802
diff
changeset
|
216 |