Show More
@@ -544,7 +544,7 b' class svnsubrepo(abstractsubrepo):' | |||
|
544 | 544 | |
|
545 | 545 | def dirty(self, ignoreupdate=False): |
|
546 | 546 | if not self._wcchanged()[0]: |
|
547 |
if self._wcrev() == self._state[1] |
|
|
547 | if self._wcrev() == self._state[1] or ignoreupdate: | |
|
548 | 548 | return False |
|
549 | 549 | return True |
|
550 | 550 |
@@ -345,3 +345,42 b' handle subrepos safely on qrecord' | |||
|
345 | 345 | % debugsub should be empty |
|
346 | 346 | |
|
347 | 347 | $ cd .. |
|
348 | ||
|
349 | ||
|
350 | handle svn subrepos safely | |
|
351 | ||
|
352 | $ svnadmin create svn-repo-2499 | |
|
353 | $ curpath=`pwd | tr '\\\\' /` | |
|
354 | $ expr "$svnpath" : "\/" > /dev/null | |
|
355 | > if [ $? -ne 0 ]; then | |
|
356 | > curpath="/$curpath" | |
|
357 | > fi | |
|
358 | $ svnurl="file://$curpath/svn-repo-2499/project" | |
|
359 | $ mkdir -p svn-project-2499/trunk | |
|
360 | $ svn import -m 'init project' svn-project-2499 "$svnurl" | |
|
361 | Adding svn-project-2499/trunk | |
|
362 | ||
|
363 | Committed revision 1. | |
|
364 | ||
|
365 | qnew on repo w/svn subrepo | |
|
366 | $ mkrepo repo-2499-svn-subrepo | |
|
367 | $ svn co "$svnurl"/trunk sub | |
|
368 | Checked out revision 1. | |
|
369 | $ echo 'sub = [svn]sub' >> .hgsub | |
|
370 | $ hg add .hgsub | |
|
371 | $ hg status -S | |
|
372 | A .hgsub | |
|
373 | ? sub/.svn/entries | |
|
374 | $ hg qnew -m0 0.diff | |
|
375 | committing subrepository sub | |
|
376 | $ cd sub | |
|
377 | $ echo a > a | |
|
378 | $ svn add a | |
|
379 | A a | |
|
380 | $ svn st | |
|
381 | A a | |
|
382 | $ cd .. | |
|
383 | $ hg status -S # doesn't show status for svn subrepos (yet) | |
|
384 | $ hg qnew -m1 1.diff | |
|
385 | abort: uncommitted changes in subrepository sub | |
|
386 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now