Bazaar

  1. Bug #688506
  2. Comment #1

Comment 1 for bug 688506

Revision history for this message
Vincent Ladeuil (vila) wrote : Re: "bzr help conflict-types" suggests incorrect "bzr resolve" command line

Ouch.

There is a FIXME in this code:

                    # FIXME: There is a special case here related to the option
                    # handling that could be clearer and easier to discover by
                    # providing an --auto action (bug #344013 and #383396) and
                    # make it mandatory instead of implicit and active only
                    # when no file_list is provided -- vila 091229
                    action = 'auto'

Looks like the FIXME author and the doc author went out of sync.... ;)