← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_shelf.py

  • Committer: Aaron Bentley
  • Date: 2008-10-16 21:27:10 UTC
  • mfrom: (0.15.26 unshelve)
  • mto: (0.16.74 shelf-ui)
  • mto: This revision was merged to the branch mainline in revision 3820.
  • Revision ID: aaron@aaronbentley.com-20081016212710-h9av3nhk76dvmsv5
Merge with unshelve

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf.py
1
 
# Copyright (C) 2008 Aaron Bentley <aaron@aaronbentley.com>
 
1
# Copyright (C) 2008 Canonical Ltd.
2
2
#
3
3
#    This program is free software; you can redistribute it and/or modify
4
4
#    it under the terms of the GNU General Public License as published by
16
16
 
17
17
import os
18
18
 
19
 
from bzrlib import pack, tests, transform
20
 
from bzrlib.plugins.shelf2 import shelf, serialize_transform
 
19
from bzrlib import pack, shelf, tests, transform
21
20
 
22
21
 
23
22
class TestPrepareShelf(tests.TestCaseWithTransport):
242
241
        records = iter(parser.read_pending_records())
243
242
        #skip revision-id
244
243
        records.next()
245
 
        serialize_transform.deserialize(tt, records)
 
244
        tt.deserialize(records)
246
245
 
247
246
 
248
247
class TestUnshelver(tests.TestCaseWithTransport):