/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 breezy/transform.py

Merge python3-j.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
1452
1452
 
1453
1453
orphaning_registry = registry.Registry()
1454
1454
orphaning_registry.register(
1455
 
    'conflict', refuse_orphan,
 
1455
    u'conflict', refuse_orphan,
1456
1456
    'Leave orphans in place and create a conflict on the directory.')
1457
1457
orphaning_registry.register(
1458
 
    'move', move_orphan,
 
1458
    u'move', move_orphan,
1459
1459
    'Move orphans into the brz-orphans directory.')
1460
 
orphaning_registry._set_default_key('conflict')
 
1460
orphaning_registry._set_default_key(u'conflict')
1461
1461
 
1462
1462
 
1463
1463
opt_transform_orphan = _mod_config.RegistryOption(