431 $ hg status > /dev/null |
431 $ hg status > /dev/null |
432 $ cat .hg/testhgignore .hg/testhgignorerel .hgignore dir2/.hgignore dir1/.hgignore dir1/.hgignoretwo | $TESTDIR/f --sha1 |
432 $ cat .hg/testhgignore .hg/testhgignorerel .hgignore dir2/.hgignore dir1/.hgignore dir1/.hgignoretwo | $TESTDIR/f --sha1 |
433 sha1=dea19cc7119213f24b6b582a4bae7b0cb063e34e |
433 sha1=dea19cc7119213f24b6b582a4bae7b0cb063e34e |
434 $ hg debugstate --docket | grep ignore |
434 $ hg debugstate --docket | grep ignore |
435 ignore pattern hash: dea19cc7119213f24b6b582a4bae7b0cb063e34e |
435 ignore pattern hash: dea19cc7119213f24b6b582a4bae7b0cb063e34e |
436 |
436 $ cd .. |
437 #endif |
437 |
|
438 Check that the hash depends on the source of the hgignore patterns |
|
439 (otherwise the context is lost and things like subinclude are cached improperly) |
|
440 |
|
441 $ hg init ignore-collision |
|
442 $ cd ignore-collision |
|
443 $ echo > .hg/testhgignorerel |
|
444 |
|
445 $ mkdir dir1/ dir1/subdir |
|
446 $ touch dir1/subdir/f dir1/subdir/ignored1 |
|
447 $ echo 'ignored1' > dir1/.hgignore |
|
448 |
|
449 $ mkdir dir2 dir2/subdir |
|
450 $ touch dir2/subdir/f dir2/subdir/ignored2 |
|
451 $ echo 'ignored2' > dir2/.hgignore |
|
452 $ echo 'subinclude:dir2/.hgignore' >> .hgignore |
|
453 $ echo 'subinclude:dir1/.hgignore' >> .hgignore |
|
454 |
|
455 $ hg commit -Aqm_ |
|
456 |
|
457 $ > dir1/.hgignore |
|
458 $ echo 'ignored' > dir2/.hgignore |
|
459 $ echo 'ignored1' >> dir2/.hgignore |
|
460 $ hg status |
|
461 M dir1/.hgignore |
|
462 M dir2/.hgignore |
|
463 ? dir1/subdir/ignored1 (missing-correct-output !) |
|
464 |
|
465 #endif |