- 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.
* 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.txt |
5377.2.1 | 14 years ago | Andrew Bennetts | Merge lp:bzr/2.2 into lp:bzr, including fixes for | 8.3 KB |
|
|