~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Vincent Ladeuil
  • Date: 2010-09-16 09:06:56 UTC
  • mto: (5502.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5504.
  • Revision ID: v.ladeuil+lp@free.fr-20100916090656-acrq9cza0gi1447f
Prepare for more ways to handle orphans.

* bzrlib/transform.py:
(TreeTransformBase._get_potential_orphans): Factored out from
conflict_pass.
(new_orphan): Thunk to move_orphan.
(orphaning_registry): First rough definition.
(conflict_pass): Be ready for orphan handlings that don't move the
orphans out of the way.

Show diffs side-by-side

added added

removed removed

Lines of Context:
3267
3267
        self.addCleanup(tt.finalize)
3268
3268
        self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3269
3269
 
3270
 
    def test_new_orphan(self):
 
3270
    def test_new_orphan_created(self):
3271
3271
        wt = self.make_branch_and_tree('.')
3272
3272
        self.build_tree(['dir/', 'dir/foo'])
3273
3273
        wt.add(['dir'], ['dir-id'])