Mercurial > hg

comparison tests/test-subrepo-svn.t @ 12316:4134686b83e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add exit codes to unified tests
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Sep 2010 17:51:32 -0500
parents affec9fb56ef
children 22f3353bcc36
comparison
equal deleted inserted replaced
12315:ca58f6475f1d 12316:4134686b83e1
151 151
152 $ echo zzz > s/externals/other 152 $ echo zzz > s/externals/other
153 $ hg ci -m 'amend externals from hg' 153 $ hg ci -m 'amend externals from hg'
154 committing subrepository s 154 committing subrepository s
155 abort: cannot commit svn externals 155 abort: cannot commit svn externals
156 [255]
156 $ hg diff --subrepos -r 1:2 | grep -v diff 157 $ hg diff --subrepos -r 1:2 | grep -v diff
157 --- a/.hgsubstate Thu Jan 01 00:00:00 1970 +0000 158 --- a/.hgsubstate Thu Jan 01 00:00:00 1970 +0000
158 +++ b/.hgsubstate Thu Jan 01 00:00:00 1970 +0000 159 +++ b/.hgsubstate Thu Jan 01 00:00:00 1970 +0000
159 @@ -1,1 +1,1 @@ 160 @@ -1,1 +1,1 @@
160 -2 s 161 -2 s
171 $ svn propset svn:mime-type 'text/html' s/externals/other 172 $ svn propset svn:mime-type 'text/html' s/externals/other
172 property 'svn:mime-type' set on 's/externals/other' 173 property 'svn:mime-type' set on 's/externals/other'
173 $ hg ci -m 'amend externals from hg' 174 $ hg ci -m 'amend externals from hg'
174 committing subrepository s 175 committing subrepository s
175 abort: cannot commit svn externals 176 abort: cannot commit svn externals
177 [255]
176 $ svn revert -q s/externals/other 178 $ svn revert -q s/externals/other
177 179
178 clone 180 clone
179 181
180 $ cd .. 182 $ cd ..