comparison tests/test_pull_fallback.py @ 1106:5cb6c95e0283 stable

Merge default and stable so I can do stable releases again.
author Augie Fackler <raf@durin42.com>
date Tue, 11 Feb 2014 12:48:49 -0500
parents f6c9394032cb
children 4f1461428334
comparison
equal deleted inserted replaced
1020:b5b1fce26f1f 1106:5cb6c95e0283
29 'mercurial.patch.patchbackend': 1, 29 'mercurial.patch.patchbackend': 1,
30 'stupid.diff_branchrev': 1, 30 'stupid.diff_branchrev': 1,
31 'stupid.fetch_branchrev': 1, 31 'stupid.fetch_branchrev': 1,
32 } 32 }
33 33
34 repo, repo_path = self._loadupdate( 34 self.stupid = True
35 'single_rev.svndump', stupid=True) 35 repo, repo_path = self._loadupdate('single_rev.svndump')
36 self.stupid = False
36 37
37 # Passing stupid=True doesn't seem to be working - force it 38 # Passing stupid=True doesn't seem to be working - force it
38 repo.ui.setconfig('hgsubversion', 'stupid', "true") 39 repo.ui.setconfig('hgsubversion', 'stupid', "true")
39 state = repo.parents() 40 state = repo.parents()
40 41
98 99
99 return replaced 100 return replaced
100 101
101 def _patchbackend_raise(*p, **kw): 102 def _patchbackend_raise(*p, **kw):
102 raise mercurial.patch.PatchError("patch failed") 103 raise mercurial.patch.PatchError("patch failed")
103
104 def suite():
105 import unittest, sys
106 return unittest.findTestCases(sys.modules[__name__])