##// END OF EJS Templates
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov -
r13233:0b30e614 stable
parent child Browse files
Show More
@@ -503,7 +503,7 b' class dirstate(object):'
503 i, j = 0, 0
503 i, j = 0, 0
504 while i < len(files) and j < len(subrepos):
504 while i < len(files) and j < len(subrepos):
505 subpath = subrepos[j] + "/"
505 subpath = subrepos[j] + "/"
506 if not files[i].startswith(subpath):
506 if files[i] < subpath:
507 i += 1
507 i += 1
508 continue
508 continue
509 while files and files[i].startswith(subpath):
509 while files and files[i].startswith(subpath):
@@ -656,3 +656,22 b' Try to push from the other side'
656 adding manifests
656 adding manifests
657 adding file changes
657 adding file changes
658 added 1 changesets with 1 changes to 1 files
658 added 1 changesets with 1 changes to 1 files
659
660 Check status of files when none of them belong to the first
661 subrepository:
662
663 $ hg init subrepo-status
664 $ cd subrepo-status
665 $ hg init subrepo-1
666 $ hg init subrepo-2
667 $ cd subrepo-2
668 $ touch file
669 $ hg add file
670 $ cd ..
671 $ echo subrepo-1 = subrepo-1 > .hgsub
672 $ echo subrepo-2 = subrepo-2 >> .hgsub
673 $ hg add .hgsub
674 $ hg ci -m 'Added subrepos'
675 committing subrepository subrepo-1
676 committing subrepository subrepo-2
677 $ hg st subrepo-2/file
General Comments 0
You need to be logged in to leave comments. Login now