comparison tests/test-subrepo-svn.t @ 13322:c19b9282d3a7 stable

subrepo: make update -C clean the working directory for svn subrepos This makes 'hg update --clean' behave the same way for both kinds of subrepositories. Before Subversion subrepos did not take the clean parameter into account, but just updated to the given revision and merged uncommitted changes into that.
author Erik Zielke <ez@aragost.com>
date Mon, 31 Jan 2011 13:33:41 +0100
parents d0e0d3d43e14
children 927e3940bfc3
comparison
equal deleted inserted replaced
13314:8dc488dfcdb4 13322:c19b9282d3a7
262 update to nullrev (must delete the subrepo) 262 update to nullrev (must delete the subrepo)
263 263
264 $ hg up null 264 $ hg up null
265 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 265 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
266 $ ls 266 $ ls
267
268 Check hg update --clean
269 $ cd $TESTTMP/sub/t
270 $ cd s
271 $ echo c0 > alpha
272 $ echo c1 > f1
273 $ echo c1 > f2
274 $ svn add f1 -q
275 $ svn status
276 ? a
277 X externals
278 ? f2
279 M alpha
280 A f1
281
282 Performing status on external item at 'externals'
283 $ cd ..
284 $ hg update -C
285
286 Fetching external item into '$TESTTMP/sub/t/s/externals'
287 Checked out external at revision 1.
288
289 Checked out revision 3.
290 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
291 $ cd s
292 $ svn status
293 ? a
294 X externals
295 ? f1
296 ? f2
297
298 Performing status on external item at 'externals'