Mercurial > hgsubversion
comparison tests/test_push_command.py @ 556:8522f8ef799e
pushmod: make outdated parent error message more helpful
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 07 Feb 2010 15:56:25 +0100 |
| parents | cf4fe45bf8fd |
| children | d74bf020a61c |
comparison
equal
deleted
inserted
replaced
| 555:cbd7065e6ab4 | 556:8522f8ef799e |
|---|---|
| 473 try: | 473 try: |
| 474 self.pushrevisions() | 474 self.pushrevisions() |
| 475 assert False, 'This should have aborted!' | 475 assert False, 'This should have aborted!' |
| 476 except hgutil.Abort, e: | 476 except hgutil.Abort, e: |
| 477 self.assertEqual(e.args[0], | 477 self.assertEqual(e.args[0], |
| 478 'Base text was out of date, maybe rebase?') | 478 'Outgoing changesets parent is not at subversion ' |
| 479 'HEAD\n' | |
| 480 '(pull again and rebase on a newer revision)') | |
| 479 | 481 |
| 480 | 482 |
| 481 def suite(): | 483 def suite(): |
| 482 test_classes = [PushTests, ] | 484 test_classes = [PushTests, ] |
| 483 tests = [] | 485 tests = [] |