/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_check_reconcile.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_check_reconcile.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests that use BrokenRepoScenario objects.
18
18
 
48
48
 
49
49
    def add_revision(self, repo, revision_id, inv, parent_ids):
50
50
        """Add a revision with a given inventory and parents to a repository.
51
 
        
 
51
 
52
52
        :param repo: a repository.
53
53
        :param revision_id: the revision ID for the new revision.
54
54
        :param inv: an inventory (such as created by
142
142
 
143
143
    def shas_for_versions_of_file(self, repo, versions):
144
144
        """Get the SHA-1 hashes of the versions of 'a-file' in the repository.
145
 
        
 
145
 
146
146
        :param repo: the repository to get the hashes from.
147
147
        :param versions: a list of versions to get hashes for.
148
148