~bzr-pqm/bzr/bzr.dev

  • Committer: Vincent Ladeuil
  • Date: 2010-09-16 16:13:18 UTC
  • mto: (5502.1.1 trunk)
  • 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.
Filename Latest Rev Last Changed Committer Comment Size
..
index.html 5050.22.1 14 years ago John Arbash Meinel Lots of documentation updates. We had a lot of ht 3.1 KB Diff Download File
layout.html 5068.1.1 14 years ago Vincent Ladeuil Merge 2.1 into trunk including fixes for #331095, 297 bytes Diff Download File