Mercurial > hgsubversion

comparison tests/test_push_command.py @ 690:4b55fb6d6847

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove constant rev no from test script
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Wed, 08 Sep 2010 10:42:53 +0200
parents e910e3ebd23b
children c2b9e08ecf10
comparison
equal deleted inserted replaced
689:35a1e93b6f78 690:4b55fb6d6847
469 469
470 def test_push_outdated_base_text(self): 470 def test_push_outdated_base_text(self):
471 self.test_push_two_revs() 471 self.test_push_two_revs()
472 changes = [('adding_file', 'adding_file', 'different_content', ), 472 changes = [('adding_file', 'adding_file', 'different_content', ),
473 ] 473 ]
474 self.commitchanges(changes, parent='tip') 474 par = self.repo['tip'].rev()
475 self.commitchanges(changes, parent=par)
475 self.pushrevisions() 476 self.pushrevisions()
476 changes = [('adding_file', 'adding_file', 477 changes = [('adding_file', 'adding_file',
477 'even_more different_content', ), 478 'even_more different_content', ),
478 ] 479 ]
479 self.commitchanges(changes, parent=3) 480 self.commitchanges(changes, parent=par)
480 try: 481 try:
481 self.pushrevisions() 482 self.pushrevisions()
482 assert False, 'This should have aborted!' 483 assert False, 'This should have aborted!'
483 except hgutil.Abort, e: 484 except hgutil.Abort, e:
484 self.assertEqual(e.args[0], 485 self.assertEqual(e.args[0],