← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_inv.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/workingtree_implementations/test_inv.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 for interface conformance of inventories of working trees."""
18
18
 
137
137
        self.build_tree(['dir/', 'dir/child', 'other/'])
138
138
        wt.add(['dir', 'dir/child', 'other'],
139
139
               ['dir-id', 'child-id', 'other-id'])
140
 
        # this delta moves dir-id to dir2 and reparents 
 
140
        # this delta moves dir-id to dir2 and reparents
141
141
        # child-id to a parent of other-id
142
142
        wt.apply_inventory_delta([('dir', 'dir2', 'dir-id',
143
143
            inventory.InventoryDirectory('dir-id', 'dir2', root_id)),