-
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.