← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Robert Collins
  • Date: 2005-10-18 23:47:12 UTC
  • mfrom: (0.2.1)
  • Revision ID: robertc@robertcollins.net-20051018234712-45a83974f691c860
Bugfix the new pull --clobber to not generate spurious conflicts.

When --clobber clobbered the history, a bad merge base was used.

Supporting this:
* merge.merge_inner now has tempdir as an optional parameter. (Robert Collins)

* Tree.kind is not recorded at the top level of the hierarchy, as it was
  missing on EmptyTree, leading to a bug with merge on EmptyTrees.
  (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
150
150
    Option.OPTIONS[name] = Option(name, **kwargs)
151
151
 
152
152
_global_option('all')
 
153
_global_option('clobber')
153
154
_global_option('basis', type=str)
154
155
_global_option('diff-options', type=str)
155
 
_global_option('help')
 
156
_global_option('help',
 
157
               help='show help message')
156
158
_global_option('file', type=unicode)
157
159
_global_option('force')
158
160
_global_option('format', type=unicode)
159
161
_global_option('forward')
160
162
_global_option('message', type=unicode)
161
163
_global_option('no-recurse')
162
 
_global_option('profile')
 
164
_global_option('profile',
 
165
               help='show performance profiling information')
163
166
_global_option('revision', type=_parse_revision_str)
164
167
_global_option('short')
165
168
_global_option('show-ids',