~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5409.1.16.

  • Committer: Vincent Ladeuil
  • Date: 2010-09-16 16:13:18 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-20100916161318-c9k41sne1m12rxl9
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.

* bzrlib/transform.py:
(TreeTransformBase._get_potential_orphans): Simplified.
(DiskTreeTransform.new_orphan): Use the orphaning_registry.
(refuse_orphan): Implement the previous behaviour (never orphan).
(conflict_pass): Clarify orphan creation and fallback on error.

* bzrlib/tests/test_transform.py:
(TestOrphan.test_never_orphan): Add more tests to cover no
orphaning and orphaning errors.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: