Show More
@@ -1332,6 +1332,8 b' class svnsubrepo(abstractsubrepo):' | |||||
1332 |
|
1332 | |||
1333 | @annotatesubrepoerror |
|
1333 | @annotatesubrepoerror | |
1334 | def dirty(self, ignoreupdate=False, missing=False): |
|
1334 | def dirty(self, ignoreupdate=False, missing=False): | |
|
1335 | if self._svnmissing(): | |||
|
1336 | return self._state[1] != '' | |||
1335 | wcchanged = self._wcchanged() |
|
1337 | wcchanged = self._wcchanged() | |
1336 | changed = wcchanged[0] or (missing and wcchanged[2]) |
|
1338 | changed = wcchanged[0] or (missing and wcchanged[2]) | |
1337 | if not changed: |
|
1339 | if not changed: |
@@ -253,3 +253,72 b' depot that can be seen from the test env' | |||||
253 | abort: svn-empty: missing or unsupported repository |
|
253 | abort: svn-empty: missing or unsupported repository | |
254 | [255] |
|
254 | [255] | |
255 | $ mv format svn-empty/format |
|
255 | $ mv format svn-empty/format | |
|
256 | ||||
|
257 | enable svn subrepos | |||
|
258 | ||||
|
259 | $ cat >> $HGRCPATH <<EOF | |||
|
260 | > [subrepos] | |||
|
261 | > svn:allowed = true | |||
|
262 | > EOF | |||
|
263 | ||||
|
264 | try converting when we have an svn subrepo and a merge in hg superrepo (issue5657) | |||
|
265 | ||||
|
266 | $ cd "$TESTTMP" | |||
|
267 | $ hg init withmerge | |||
|
268 | $ cd withmerge | |||
|
269 | $ echo "subrepo = [svn]$SVNREPOURL" >.hgsub | |||
|
270 | $ hg add .hgsub | |||
|
271 | $ svn checkout "$SVNREPOURL" subrepo | |||
|
272 | A subrepo/proj B | |||
|
273 | A subrepo/proj B/mytrunk | |||
|
274 | A subrepo/proj B/mytrunk/letter .txt | |||
|
275 | A subrepo/proj B/mytrunk/letter2.txt | |||
|
276 | A subrepo/proj B/tags | |||
|
277 | A subrepo/proj B/tags/v0.1 | |||
|
278 | A subrepo/proj B/tags/v0.1/letter .txt | |||
|
279 | A subrepo/proj B/tags/v0.2 | |||
|
280 | A subrepo/proj B/tags/v0.2/letter .txt | |||
|
281 | A subrepo/proj B/tags/v0.2/letter2.txt | |||
|
282 | Checked out revision 9. | |||
|
283 | $ hg ci -m "Adding svn subrepo" | |||
|
284 | $ touch file1.txt | |||
|
285 | $ hg add file1.txt | |||
|
286 | $ hg ci -m "Adding file1" | |||
|
287 | $ hg up 0 | |||
|
288 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
289 | $ touch file2.txt | |||
|
290 | $ hg add file2.txt | |||
|
291 | $ hg ci -m "Adding file2" | |||
|
292 | created new head | |||
|
293 | $ hg merge 1 | |||
|
294 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
295 | (branch merge, don't forget to commit) | |||
|
296 | $ hg ci -m "merged" | |||
|
297 | $ cd .. | |||
|
298 | $ hg --config extensions.convert= convert withmerge withmerge-converted | |||
|
299 | initializing destination withmerge-converted repository | |||
|
300 | scanning source... | |||
|
301 | sorting... | |||
|
302 | converting... | |||
|
303 | 3 Adding svn subrepo | |||
|
304 | 2 Adding file1 | |||
|
305 | 1 Adding file2 | |||
|
306 | 0 merged | |||
|
307 | $ cd withmerge-converted | |||
|
308 | $ hg up | |||
|
309 | A subrepo/proj B | |||
|
310 | A subrepo/proj B/mytrunk | |||
|
311 | A subrepo/proj B/mytrunk/letter .txt | |||
|
312 | A subrepo/proj B/mytrunk/letter2.txt | |||
|
313 | A subrepo/proj B/tags | |||
|
314 | A subrepo/proj B/tags/v0.1 | |||
|
315 | A subrepo/proj B/tags/v0.1/letter .txt | |||
|
316 | A subrepo/proj B/tags/v0.2 | |||
|
317 | A subrepo/proj B/tags/v0.2/letter .txt | |||
|
318 | A subrepo/proj B/tags/v0.2/letter2.txt | |||
|
319 | Checked out revision 9. | |||
|
320 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
321 | $ ls | |||
|
322 | file1.txt | |||
|
323 | file2.txt | |||
|
324 | subrepo |
General Comments 0
You need to be logged in to leave comments.
Login now