subrepo: consider the parent repo dirty when a file is missing
This simply passes the 'missing' argument down from the context of the parent repo, so the same rules apply. subrepo.bailifchanged() is hardcoded to care about missing files, because cmdutil.bailifchanged() is too. In the end, it looks like this addresses inconsistencies with 'archive', 'identify', blackbox logs, 'merge', and 'update --check'. I wasn't sure how to implement this in git, so that's left for someone more familiar with it.
Showing
- hgext/largefiles/overrides.py 2 additions, 2 deletionshgext/largefiles/overrides.py
- mercurial/context.py 1 addition, 1 deletionmercurial/context.py
- mercurial/subrepo.py 14 additions, 10 deletionsmercurial/subrepo.py
- tests/test-merge-subrepos.t 12 additions, 11 deletionstests/test-merge-subrepos.t
- tests/test-subrepo-deep-nested-change.t 2 additions, 2 deletionstests/test-subrepo-deep-nested-change.t
Loading
Please register or sign in to comment