Re: [RFC PATCH 0/2] Introduce new merge-tree-ort command

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 13, 2022, 06:08 UTC
Message-ID: <xmqqk0f4jhh8.fsf@gitster.g>
In-Reply-To: <CABPp-BHQdkhAEmTrtc+XMgj5A5ASBVRw0_bXH10NSrMsyRK+oA@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 8 quoted lines

>> so it may be quite simple to deprecate "merge -s recursive".
>
> Yes...but why deprecate?  I thought the plan was to (eventually) make
> requests for either `recursive` or `ort` be handled by running the
> `ort` backend.  Making that kind of switch is much smaller than the
> one we already made to switch the default backend from `recursive` to
> `ort`, so I'm not sure I see what we gain by doing such a switch in
> stages.  Maybe I'm missing something?

Didn't we "deprecate" but still indefinitely support "annotate"? I have been assuming that recursive will be in that category after ort establishes itself.