Mercurial > hgsubversion

comparison tests/test_externals.py @ 870:1eb2a4428c42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test_util: pass repo_path to svnco() explicitely
author Patrick Mezard <patrick@mezard.eu>
date Thu, 19 Apr 2012 18:29:30 +0200
parents db3a651494f9
children d741f536f23a
comparison
equal deleted inserted replaced
869:db3a651494f9 870:1eb2a4428c42
344 HEAD subdir2/deps/project2 344 HEAD subdir2/deps/project2
345 """), 345 """),
346 ('subdir1/a', 'subdir1/a', 'a'), 346 ('subdir1/a', 'subdir1/a', 'a'),
347 ('subdir2/a', 'subdir2/a', 'a'), 347 ('subdir2/a', 'subdir2/a', 'a'),
348 ] 348 ]
349 self.svnco('externals/project2', '2', 'dir/deps/project2') 349 self.svnco(repo_path, 'externals/project2', '2', 'dir/deps/project2')
350 self.svnco('externals/project1', '2', 'subdir1/deps/project1') 350 self.svnco(repo_path, 'externals/project1', '2', 'subdir1/deps/project1')
351 self.svnco('externals/project2', '2', 'subdir2/deps/project2') 351 self.svnco(repo_path, 'externals/project2', '2', 'subdir2/deps/project2')
352 self.commitchanges(changes) 352 self.commitchanges(changes)
353 self.pushrevisions(stupid) 353 self.pushrevisions(stupid)
354 self.assertchanges(changes, self.repo['tip']) 354 self.assertchanges(changes, self.repo['tip'])
355 355
356 # Check .hgsub and .hgsubstate were not pushed 356 # Check .hgsub and .hgsubstate were not pushed
369 HEAD subdir1/deps/project2 369 HEAD subdir1/deps/project2
370 """), 370 """),
371 # This removal used to trigger the parent directory removal 371 # This removal used to trigger the parent directory removal
372 ('subdir1/a', None, None), 372 ('subdir1/a', None, None),
373 ] 373 ]
374 self.svnco('externals/project1', '2', 'subdir1/deps/project1') 374 self.svnco(repo_path, 'externals/project1', '2', 'subdir1/deps/project1')
375 self.svnco('externals/project2', '2', 'subdir1/deps/project2') 375 self.svnco(repo_path, 'externals/project2', '2', 'subdir1/deps/project2')
376 self.commitchanges(changes) 376 self.commitchanges(changes)
377 self.pushrevisions(stupid) 377 self.pushrevisions(stupid)
378 self.assertchanges(changes, self.repo['tip']) 378 self.assertchanges(changes, self.repo['tip'])
379 # Check subdir2/a is still there even if the externals were removed 379 # Check subdir2/a is still there even if the externals were removed
380 self.assertTrue('subdir2/a' in self.repo['tip']) 380 self.assertTrue('subdir2/a' in self.repo['tip'])