Mercurial > public > mercurial-scm > hg
diff tests/test-subrepo-deep-nested-change.t @ 23537:f1b06a8aad42
commit: propagate --addremove to subrepos if -S is specified (issue3759)
The recursive addremove operation occurs completely before the first subrepo is
committed. Only hg subrepos support the addremove operation at the moment- svn
and git subrepos will warn and abort the commit.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Mon, 24 Nov 2014 22:27:49 -0500 |
| parents | bd296bb4b5c8 |
| children | ccfb56450f21 |
line wrap: on
line diff
--- a/tests/test-subrepo-deep-nested-change.t Wed Nov 26 16:13:38 2014 -0500 +++ b/tests/test-subrepo-deep-nested-change.t Mon Nov 24 22:27:49 2014 -0500 @@ -106,8 +106,8 @@ $ hg --config extensions.largefiles=! add sub1/sub2/test.txt $ mkdir sub1/sub2/folder $ echo 'subfolder' > sub1/sub2/folder/test.txt - $ hg --config extensions.largefiles=! add sub1/sub2/folder/test.txt - $ hg ci -Sm "add test.txt" + $ hg ci -ASm "add test.txt" + adding sub1/sub2/folder/test.txt (glob) committing subrepository sub1 committing subrepository sub1/sub2 (glob) @@ -128,6 +128,15 @@ R sub1/.hgsubstate R sub1/sub2/folder/test.txt $ hg update -Cq + $ rm sub1/sub2/folder/test.txt + $ rm sub1/sub2/test.txt + $ hg ci -ASm "remove test.txt" + removing sub1/sub2/folder/test.txt (glob) + removing sub1/sub2/test.txt (glob) + committing subrepository sub1 + committing subrepository sub1/sub2 (glob) + $ hg rollback -q + $ hg up -Cq $ hg --config extensions.largefiles=! archive -S ../archive_all $ find ../archive_all | sort