Mercurial > public > mercurial-scm > hg
diff tests/test-subrepo-deep-nested-change.t @ 33364:bf2daeddd42b
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.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 09 Jul 2017 02:55:46 -0400 |
| parents | 3047167733dc |
| children | 8074e2d006c0 |
line wrap: on
line diff
--- a/tests/test-subrepo-deep-nested-change.t Sun Jul 09 02:46:03 2017 -0400 +++ b/tests/test-subrepo-deep-nested-change.t Sun Jul 09 02:55:46 2017 -0400 @@ -249,13 +249,13 @@ changessincelatesttag: 4 $ hg update -Cq . -TODO: add the dirty flag for missing subrepo files +A deleted subrepo file is flagged as dirty, like the top level repo $ rm -r ../wdir sub1/sub2/folder/test.txt $ hg archive -S -qr 'wdir()' ../wdir $ cat ../wdir/.hg_archival.txt repo: 7f491f53a367861f47ee64a80eb997d1f341b77a - node: 9bb10eebee29dc0f1201dcf5977b811a540255fd + node: 9bb10eebee29dc0f1201dcf5977b811a540255fd+ branch: default latesttag: null latesttagdistance: 4