##// END OF EJS Templates
test-convert-svn-sink: test directory additions
Patrick Mezard -
r5538:dc8fa348 default
parent child Browse files
Show More
@@ -8,6 +8,8 b' echo "convert = " >> $HGRCPATH'
8 hg init a
8 hg init a
9
9
10 echo a > a/a
10 echo a > a/a
11 mkdir -p a/d1/d2
12 echo b > a/d1/d2/b
11 echo % add
13 echo % add
12 hg --cwd a ci -d '0 0' -A -m 'add a file'
14 hg --cwd a ci -d '0 0' -A -m 'add a file'
13
15
@@ -1,7 +1,8 b''
1 % add
1 % add
2 adding a
2 adding a
3 adding d1/d2/b
3 % modify
4 % modify
4 1:10307c220ed9
5 1:e0e2b8a9156b
5 assuming destination a-hg
6 assuming destination a-hg
6 initializing svn repo 'a-hg'
7 initializing svn repo 'a-hg'
7 initializing svn wc 'a-hg-wc'
8 initializing svn wc 'a-hg-wc'
@@ -13,6 +14,9 b' 0 modify a file'
13 At revision 2.
14 At revision 2.
14 2 2 test .
15 2 2 test .
15 2 2 test a
16 2 2 test a
17 2 1 test d1
18 2 1 test d1/d2
19 2 1 test d1/d2/b
16 <?xml version="1.0"?>
20 <?xml version="1.0"?>
17 <log>
21 <log>
18 <logentry
22 <logentry
@@ -32,18 +36,26 b' At revision 2.'
32 <paths>
36 <paths>
33 <path
37 <path
34 action="A">/a</path>
38 action="A">/a</path>
39 <path
40 action="A">/d1</path>
41 <path
42 action="A">/d1/d2</path>
43 <path
44 action="A">/d1/d2/b</path>
35 </paths>
45 </paths>
36 <msg>add a file</msg>
46 <msg>add a file</msg>
37 </logentry>
47 </logentry>
38 </log>
48 </log>
39 a:
49 a:
40 a
50 a
51 d1
41
52
42 a-hg-wc:
53 a-hg-wc:
43 a
54 a
55 d1
44 same
56 same
45 % rename
57 % rename
46 2:6e45a219686e
58 2:7009fc4efb34
47 assuming destination a-hg
59 assuming destination a-hg
48 initializing svn wc 'a-hg-wc'
60 initializing svn wc 'a-hg-wc'
49 scanning source...
61 scanning source...
@@ -53,6 +65,9 b' 0 rename a file'
53 At revision 3.
65 At revision 3.
54 3 3 test .
66 3 3 test .
55 3 3 test b
67 3 3 test b
68 3 1 test d1
69 3 1 test d1/d2
70 3 1 test d1/d2/b
56 <?xml version="1.0"?>
71 <?xml version="1.0"?>
57 <log>
72 <log>
58 <logentry
73 <logentry
@@ -72,11 +87,13 b' At revision 3.'
72 </log>
87 </log>
73 a:
88 a:
74 b
89 b
90 d1
75
91
76 a-hg-wc:
92 a-hg-wc:
77 b
93 b
94 d1
78 % copy
95 % copy
79 3:d811dc81efbb
96 3:56c519973ce6
80 assuming destination a-hg
97 assuming destination a-hg
81 initializing svn wc 'a-hg-wc'
98 initializing svn wc 'a-hg-wc'
82 scanning source...
99 scanning source...
@@ -87,6 +104,9 b' At revision 4.'
87 4 4 test .
104 4 4 test .
88 4 3 test b
105 4 3 test b
89 4 4 test c
106 4 4 test c
107 4 1 test d1
108 4 1 test d1/d2
109 4 1 test d1/d2/b
90 <?xml version="1.0"?>
110 <?xml version="1.0"?>
91 <log>
111 <log>
92 <logentry
112 <logentry
@@ -105,12 +125,14 b' At revision 4.'
105 a:
125 a:
106 b
126 b
107 c
127 c
128 d1
108
129
109 a-hg-wc:
130 a-hg-wc:
110 b
131 b
111 c
132 c
133 d1
112 % remove
134 % remove
113 4:045e93063aca
135 4:ed4dc9a6f585
114 assuming destination a-hg
136 assuming destination a-hg
115 initializing svn wc 'a-hg-wc'
137 initializing svn wc 'a-hg-wc'
116 scanning source...
138 scanning source...
@@ -120,6 +142,9 b' 0 remove a file'
120 At revision 5.
142 At revision 5.
121 5 5 test .
143 5 5 test .
122 5 4 test c
144 5 4 test c
145 5 1 test d1
146 5 1 test d1/d2
147 5 1 test d1/d2/b
123 <?xml version="1.0"?>
148 <?xml version="1.0"?>
124 <log>
149 <log>
125 <logentry
150 <logentry
@@ -135,11 +160,13 b' At revision 5.'
135 </log>
160 </log>
136 a:
161 a:
137 c
162 c
163 d1
138
164
139 a-hg-wc:
165 a-hg-wc:
140 c
166 c
167 d1
141 % executable
168 % executable
142 5:7eda3f4b5331
169 5:f205b3636d77
143 svn: Path 'b' does not exist
170 svn: Path 'b' does not exist
144 assuming destination a-hg
171 assuming destination a-hg
145 initializing svn wc 'a-hg-wc'
172 initializing svn wc 'a-hg-wc'
@@ -151,6 +178,9 b' abort: svn exited with status 1'
151 At revision 5.
178 At revision 5.
152 5 5 test .
179 5 5 test .
153 M 5 4 test c
180 M 5 4 test c
181 5 1 test d1
182 5 1 test d1/d2
183 5 1 test d1/d2/b
154 <?xml version="1.0"?>
184 <?xml version="1.0"?>
155 <log>
185 <log>
156 <logentry
186 <logentry
General Comments 0
You need to be logged in to leave comments. Login now