Rev 6091: Cleanup criss-cross merge confusion in file:///home/vila/src/bzr/experimental/expand-in-stack/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/expand-in-stack/

------------------------------------------------------------
revno: 6091
revision-id: v.ladeuil+lp at free.fr-20110829141650-mydqd8d3mloo7dwq
parent: v.ladeuil+lp at free.fr-20110829125956-n1be7la38mu12zib
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: expand-in-stack
timestamp: Mon 2011-08-29 16:16:50 +0200
message:
  Cleanup criss-cross merge confusion
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-08-29 12:59:56 +0000
+++ b/bzrlib/config.py	2011-08-29 14:16:50 +0000
@@ -2481,7 +2481,7 @@
 # Registered options in lexicographical order
 
 option_registry.register(
-    Option('bzr.workingtree.worth_saving_limit', default=u'10',
+    Option('bzr.workingtree.worth_saving_limit', default=10,
            from_unicode=int_from_store,  invalid='warning',
            help='''\
 How many changes before saving the dirstate.
@@ -2493,7 +2493,7 @@
 a file has been touched.
 '''))
 option_registry.register(
-    Option('dirstate.fdatasync', default=u'True',
+    Option('dirstate.fdatasync', default=True,
            from_unicode=bool_from_store,
            help='''\
 Flush dirstate changes onto physical disk?
@@ -2503,16 +2503,16 @@
 should not be lost if the machine crashes.  See also repository.fdatasync.
 '''))
 option_registry.register(
-    Option('debug_flags', default=u'', from_unicode=list_from_store,
+    Option('debug_flags', default=[], from_unicode=list_from_store,
            help='Debug flags to activate.'))
 option_registry.register(
-    Option('default_format', default=u'2a',
+    Option('default_format', default='2a',
            help='Format used when creating branches.'))
 option_registry.register(
     Option('editor',
            help='The command called to launch an editor to enter a message.'))
 option_registry.register(
-    Option('ignore_missing_extensions', default=u'False',
+    Option('ignore_missing_extensions', default=False,
            from_unicode=bool_from_store,
            help='''\
 Control the missing extensions warning display.
@@ -2523,7 +2523,7 @@
     Option('language',
            help='Language to translate messages into.'))
 option_registry.register(
-    Option('locks.steal_dead', default=u'False', from_unicode=bool_from_store,
+    Option('locks.steal_dead', default=False, from_unicode=bool_from_store,
            help='''\
 Steal locks that appears to be dead.