/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

  • Committer: Martin
  • Date: 2018-06-30 22:18:39 UTC
  • mfrom: (7010 work)
  • mto: This revision was merged to the branch mainline in revision 7012.
  • Revision ID: gzlist@googlemail.com-20180630221839-98zi78xwcggestse
Merge trunk to fix conflict

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
1460
orphaning_registry._set_default_key(u'conflict')
1461
1461