Mercurial > public > mercurial-scm > hg
diff tests/test-subrepo-deep-nested-change.t @ 16073:b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
When the contents of .hgsubstate are stale (either because they've
manually been tweaked or partial updates have confused it), we get
confused about whether it actually needs committing.
So instead, we actively consult the parent's substate and compare it
the actual current state when deciding whether it needs committing.
Side effect: lots of "committing subrepo" messages that didn't
correspond with real commits disappear.
This change is fairly invasive for a fairly obscure condition, so it's
kept on the default branch.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 06 Feb 2012 15:10:01 -0600 |
parents | 9910f60a37ee |
children | 7d45730ea1b8 |
line wrap: on
line diff
--- a/tests/test-subrepo-deep-nested-change.t Mon Feb 06 15:00:08 2012 -0600 +++ b/tests/test-subrepo-deep-nested-change.t Mon Feb 06 15:10:01 2012 -0600 @@ -18,7 +18,6 @@ adding sub1/.hgsub (glob) adding sub1/sub1 (glob) $ hg commit -R sub1 -m "sub1 import" - committing subrepository sub2 Preparing the 'main' repo which depends on the subrepo 'sub1' @@ -33,7 +32,6 @@ adding main/.hgsub (glob) adding main/main (glob) $ hg commit -R main -m "main import" - committing subrepository sub1 Cleaning both repositories, just as a clone -U