Mercurial > hg
comparison tests/test-subrepo-svn.t @ 33365:6d88468d435b
subrepo: make the output references to subrepositories consistent
Well, mostly. The annotation on subrepo functions tacks on a parenthetical to
the abort message, which seems reasonable for a generic mechanism. But now all
messages consistently spell out 'subrepository', and double quote the name of
the repo. I noticed the inconsistency in the change for the last commit.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 09 Jul 2017 16:13:30 -0400 |
parents | a145161debed |
children | 60ee7af2a2ba |
comparison
equal
deleted
inserted
replaced
33364:bf2daeddd42b | 33365:6d88468d435b |
---|---|
111 missing svn file, commit should fail | 111 missing svn file, commit should fail |
112 | 112 |
113 $ rm s/alpha | 113 $ rm s/alpha |
114 $ hg commit --subrepos -m 'abort on missing file' | 114 $ hg commit --subrepos -m 'abort on missing file' |
115 committing subrepository s | 115 committing subrepository s |
116 abort: cannot commit missing svn entries (in subrepo s) | 116 abort: cannot commit missing svn entries (in subrepository "s") |
117 [255] | 117 [255] |
118 $ svn revert s/alpha > /dev/null | 118 $ svn revert s/alpha > /dev/null |
119 | 119 |
120 add an unrelated revision in svn and update the subrepo to without | 120 add an unrelated revision in svn and update the subrepo to without |
121 bringing any changes. | 121 bringing any changes. |
168 this commit fails because of externals changes | 168 this commit fails because of externals changes |
169 | 169 |
170 $ echo zzz > s/externals/other | 170 $ echo zzz > s/externals/other |
171 $ hg ci --subrepos -m 'amend externals from hg' | 171 $ hg ci --subrepos -m 'amend externals from hg' |
172 committing subrepository s | 172 committing subrepository s |
173 abort: cannot commit svn externals (in subrepo s) | 173 abort: cannot commit svn externals (in subrepository "s") |
174 [255] | 174 [255] |
175 $ hg diff --subrepos -r 1:2 | grep -v diff | 175 $ hg diff --subrepos -r 1:2 | grep -v diff |
176 --- a/.hgsubstate Thu Jan 01 00:00:00 1970 +0000 | 176 --- a/.hgsubstate Thu Jan 01 00:00:00 1970 +0000 |
177 +++ b/.hgsubstate Thu Jan 01 00:00:00 1970 +0000 | 177 +++ b/.hgsubstate Thu Jan 01 00:00:00 1970 +0000 |
178 @@ -1,2 +1,2 @@ | 178 @@ -1,2 +1,2 @@ |
190 | 190 |
191 $ svn propset svn:mime-type 'text/html' s/externals/other | 191 $ svn propset svn:mime-type 'text/html' s/externals/other |
192 property 'svn:mime-type' set on 's/externals/other' (glob) | 192 property 'svn:mime-type' set on 's/externals/other' (glob) |
193 $ hg ci --subrepos -m 'amend externals from hg' | 193 $ hg ci --subrepos -m 'amend externals from hg' |
194 committing subrepository s | 194 committing subrepository s |
195 abort: cannot commit svn externals (in subrepo s) | 195 abort: cannot commit svn externals (in subrepository "s") |
196 [255] | 196 [255] |
197 $ svn revert -q s/externals/other | 197 $ svn revert -q s/externals/other |
198 | 198 |
199 clone | 199 clone |
200 | 200 |