/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Vincent Ladeuil
  • Date: 2010-09-21 16:58:50 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-20100921165850-fkrlj18p68l7xxz4
Revert to 'conflict' being the default orphaning policy and fix fallouts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1412
1412
 
1413
1413
 
1414
1414
orphaning_registry = registry.Registry()
1415
 
orphaning_registry.register('always', move_orphan,
 
1415
orphaning_registry.register('conflict', refuse_orphan,
 
1416
                            'Never create orphans.')
 
1417
orphaning_registry.register('move', move_orphan,
1416
1418
                            'Move orphans into the bzr-orphans directory.')
1417
 
orphaning_registry._set_default_key('always')
1418
 
orphaning_registry.register('never', refuse_orphan,
1419
 
                            'Never create orphans.')
 
1419
orphaning_registry._set_default_key('conflict')
1420
1420
 
1421
1421
 
1422
1422
class TreeTransform(DiskTreeTransform):