/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/config.py

  • Committer: Vincent Ladeuil
  • Date: 2011-12-19 16:41:49 UTC
  • mfrom: (6386 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6387.
  • Revision ID: v.ladeuil+lp@free.fr-20111219164149-ecfrvwscqb6v77jn
Merge trunk to resolve news conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
72
72
up=pull
73
73
"""
74
74
 
 
75
from __future__ import absolute_import
 
76
 
75
77
import os
76
78
import sys
77
79
 
2563
2565
# Registered options in lexicographical order
2564
2566
 
2565
2567
option_registry.register(
 
2568
    Option('append_revisions_only',
 
2569
           default=None, from_unicode=bool_from_store, invalid='warning',
 
2570
           help='''\
 
2571
Whether to only append revisions to the mainline.
 
2572
 
 
2573
If this is set to true, then it is not possible to change the
 
2574
existing mainline of the branch.
 
2575
'''))
 
2576
option_registry.register(
2566
2577
    Option('acceptable_keys',
2567
2578
           default=None, from_unicode=list_from_store,
2568
2579
           help="""\