Mercurial > hg
annotate tests/test-convert-cvs.out @ 9413:a5adf55ee533
manifest.add(): simplify with iterators and generator expressions
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 02 Sep 2009 20:18:35 +0200 |
parents | ba42e3c6e602 |
children | fc493cb90bb1 |
rev | line source |
---|---|
5307
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 % create cvs repository |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 % create source directory |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 % import source directory |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 N src/a |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
5 N src/b/c |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
6 |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
7 No conflicts created by this import |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
8 |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
9 % checkout source directory |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
10 U src/a |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
11 U src/b/c |
5381
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
12 % commit a new revision changing b/c |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
13 checking in src/b/c,v |
5307
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
14 % convert fresh repo |
8598
5edb2a8e29ea
convert: deprecate external cvsps, to be removed in 1.4
Patrick Mezard <pmezard@gmail.com>
parents:
6717
diff
changeset
|
15 warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4 |
5308 | 16 initializing destination src-hg repository |
5307
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
17 connecting to cvsrepo |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
18 scanning source... |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
19 sorting... |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
20 converting... |
5381
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
21 2 Initial revision |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
22 1 import |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
23 0 ci0 |
5307
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
24 updating tags |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
25 a |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
26 c |
5381
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
27 c |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
28 % convert fresh repo with --filemap |
8598
5edb2a8e29ea
convert: deprecate external cvsps, to be removed in 1.4
Patrick Mezard <pmezard@gmail.com>
parents:
6717
diff
changeset
|
29 warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4 |
5381
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
30 initializing destination src-filemap repository |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
31 connecting to cvsrepo |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
32 scanning source... |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
33 sorting... |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
34 converting... |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
35 2 Initial revision |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
36 1 import |
8611
ba42e3c6e602
convert: better feedback when filtering out empty revisions
Patrick Mezard <pmezard@gmail.com>
parents:
8598
diff
changeset
|
37 filtering out empty revision |
5381
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
38 rolling back last transaction |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
39 0 ci0 |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
40 updating tags |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
41 c |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
42 c |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
43 2 update tags files: .hgtags |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
44 1 ci0 files: b/c |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
45 0 Initial revision files: b/c |
5307
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
46 % commit new file revisions |
5364
645a40777fd4
test-convert-cvs: handle older cvs client
Christian Ebert <blacktrash@gmx.net>
parents:
5307
diff
changeset
|
47 checking in src/a,v |
645a40777fd4
test-convert-cvs: handle older cvs client
Christian Ebert <blacktrash@gmx.net>
parents:
5307
diff
changeset
|
48 checking in src/b/c,v |
5307
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
49 % convert again |
8598
5edb2a8e29ea
convert: deprecate external cvsps, to be removed in 1.4
Patrick Mezard <pmezard@gmail.com>
parents:
6717
diff
changeset
|
50 warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4 |
5307
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
51 connecting to cvsrepo |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
52 scanning source... |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
53 sorting... |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
54 converting... |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
55 0 ci1 |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
56 a |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
57 a |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
58 c |
5b0b0834419c
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
59 c |
5381
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
60 c |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
61 % convert again with --filemap |
8598
5edb2a8e29ea
convert: deprecate external cvsps, to be removed in 1.4
Patrick Mezard <pmezard@gmail.com>
parents:
6717
diff
changeset
|
62 warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4 |
5381
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
63 connecting to cvsrepo |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
64 scanning source... |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
65 sorting... |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
66 converting... |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
67 0 ci1 |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
68 c |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
69 c |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
70 c |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
71 3 ci1 files: b/c |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
72 2 update tags files: .hgtags |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
73 1 ci0 files: b/c |
6874368120dc
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5365
diff
changeset
|
74 0 Initial revision files: b/c |
5919
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
75 % commit branch |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
76 U b/c |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
77 T a |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
78 T b/c |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
79 checking in src/b/c,v |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
80 % convert again |
8598
5edb2a8e29ea
convert: deprecate external cvsps, to be removed in 1.4
Patrick Mezard <pmezard@gmail.com>
parents:
6717
diff
changeset
|
81 warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4 |
5919
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
82 connecting to cvsrepo |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
83 scanning source... |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
84 sorting... |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
85 converting... |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
86 0 ci2 |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
87 a |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
88 c |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
89 d |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
90 % convert again with --filemap |
8598
5edb2a8e29ea
convert: deprecate external cvsps, to be removed in 1.4
Patrick Mezard <pmezard@gmail.com>
parents:
6717
diff
changeset
|
91 warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4 |
5919
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
92 connecting to cvsrepo |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
93 scanning source... |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
94 sorting... |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
95 converting... |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
96 0 ci2 |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
97 c |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
98 d |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
99 4 ci2 files: b/c |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
100 3 ci1 files: b/c |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
101 2 update tags files: .hgtags |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
102 1 ci0 files: b/c |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
103 0 Initial revision files: b/c |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
104 o 5 (branch) ci2 files: b/c |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
105 | |
5920
5df7cb799baf
CVS convert: Find correct parent for new branch (issue704)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5919
diff
changeset
|
106 | o 4 () ci1 files: a b/c |
5df7cb799baf
CVS convert: Find correct parent for new branch (issue704)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5919
diff
changeset
|
107 | | |
5df7cb799baf
CVS convert: Find correct parent for new branch (issue704)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5919
diff
changeset
|
108 | o 3 () update tags files: .hgtags |
5df7cb799baf
CVS convert: Find correct parent for new branch (issue704)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5919
diff
changeset
|
109 | | |
5df7cb799baf
CVS convert: Find correct parent for new branch (issue704)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5919
diff
changeset
|
110 | o 2 () ci0 files: b/c |
5df7cb799baf
CVS convert: Find correct parent for new branch (issue704)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5919
diff
changeset
|
111 |/ |
5919
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
112 | o 1 (INITIAL) import files: |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
113 |/ |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
114 o 0 () Initial revision files: a b/c |
badf5711bd86
Test for converting a CVS branch
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5381
diff
changeset
|
115 |