##// END OF EJS Templates
clone: copy obsolete markers during local clone...
Pierre-Yves.David@ens-lyon.org -
r17249:7d4747c7 stable
parent child Browse files
Show More
@@ -232,7 +232,8 b' def _calcmode(path):'
232 mode = None
232 mode = None
233 return mode
233 return mode
234
234
235 _data = 'data 00manifest.d 00manifest.i 00changelog.d 00changelog.i phaseroots'
235 _data = ('data 00manifest.d 00manifest.i 00changelog.d 00changelog.i'
236 ' phaseroots obsstore')
236
237
237 class basicstore(object):
238 class basicstore(object):
238 '''base class for local repository stores'''
239 '''base class for local repository stores'''
@@ -411,7 +412,7 b' class fncachestore(basicstore):'
411 self.fncache.rewrite(existing)
412 self.fncache.rewrite(existing)
412
413
413 def copylist(self):
414 def copylist(self):
414 d = ('data dh fncache phaseroots'
415 d = ('data dh fncache phaseroots obsstore'
415 ' 00manifest.d 00manifest.i 00changelog.d 00changelog.i')
416 ' 00manifest.d 00manifest.i 00changelog.d 00changelog.i')
416 return (['requires', '00changelog.i'] +
417 return (['requires', '00changelog.i'] +
417 ['store/' + f for f in d.split()])
418 ['store/' + f for f in d.split()])
@@ -178,6 +178,53 b' Try to pull markers'
178 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
178 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
179 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
179 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
180
180
181 clone support
182 (markers are copied and extinct changesets are included to allow hardlinks)
183
184 $ hg clone tmpb clone-dest
185 updating to branch default
186 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
187 $ hg -R clone-dest log -G --hidden
188 @ changeset: 5:5601fb93a350
189 | tag: tip
190 | parent: 1:7c3bad9141dc
191 | user: test
192 | date: Thu Jan 01 00:00:00 1970 +0000
193 | summary: add new_3_c
194 |
195 | x changeset: 4:ca819180edb9
196 |/ parent: 1:7c3bad9141dc
197 | user: test
198 | date: Thu Jan 01 00:00:00 1970 +0000
199 | summary: add new_2_c
200 |
201 | x changeset: 3:cdbce2fbb163
202 |/ parent: 1:7c3bad9141dc
203 | user: test
204 | date: Thu Jan 01 00:00:00 1970 +0000
205 | summary: add new_c
206 |
207 | o changeset: 2:245bde4270cd
208 |/ user: test
209 | date: Thu Jan 01 00:00:00 1970 +0000
210 | summary: add original_c
211 |
212 o changeset: 1:7c3bad9141dc
213 | user: test
214 | date: Thu Jan 01 00:00:00 1970 +0000
215 | summary: add b
216 |
217 o changeset: 0:1f0dee641bb7
218 user: test
219 date: Thu Jan 01 00:00:00 1970 +0000
220 summary: add a
221
222 $ hg -R clone-dest debugobsolete
223 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f 0 {'date': '56 12', 'user': 'test'}
224 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'}
225 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
226 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
227
181
228
182 Destination repo have existing data
229 Destination repo have existing data
183 ---------------------------------------
230 ---------------------------------------
General Comments 0
You need to be logged in to leave comments. Login now