/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-06-30 12:37:04 UTC
  • mfrom: (6973.10.9 python3-i)
  • Revision ID: breezy.the.bot@gmail.com-20180630123704-jq2qazweqd3u5ssp
Add more bees.

Merged from https://code.launchpad.net/~jelmer/brz/python3-i/+merge/348244

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
1457
1457
orphaning_registry.register(
1458
1458
    '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(