From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 4152F1F463 for ; Sat, 23 Nov 2019 22:09:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726867AbfKWWIv (ORCPT ); Sat, 23 Nov 2019 17:08:51 -0500 Received: from dcvr.yhbt.net ([64.71.152.64]:38524 "EHLO dcvr.yhbt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726759AbfKWWIu (ORCPT ); Sat, 23 Nov 2019 17:08:50 -0500 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 5CC6D1F463; Sat, 23 Nov 2019 22:08:50 +0000 (UTC) Date: Sat, 23 Nov 2019 22:08:50 +0000 From: Eric Wong To: Johannes Schindelin via GitGitGadget Cc: git@vger.kernel.org, Johannes Schindelin , Junio C Hamano Subject: Re: [PATCH 6/8] git-svn: drop support for `--preserve-merges` Message-ID: <20191123220850.GA29423@dcvr> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Johannes Schindelin via GitGitGadget wrote: > We already passed the `--rebase-merges` option to `git rebase` instead, > now we make this move permanent. > diff --git a/git-svn.perl b/git-svn.perl > index 4aa208ff5f..f1fa1bc7f7 100755 > --- a/git-svn.perl > +++ b/git-svn.perl > @@ -271,7 +271,6 @@ sub _req_svn { > 'fetch-all|all' => \$_fetch_all, > 'dry-run|n' => \$_dry_run, > 'rebase-merges|p' => \$_rebase_merges, > - 'preserve-merges|p' => \$_rebase_merges, > %fc_opts } ], > 'commit-diff' => [ \&cmd_commit_diff, > 'Commit a diff between two trees', Nack, it breaks existing usages. Why the urgency with removal? I don't know a whole lot about this rebase feature in particular, but deprecation periods should be measured in years or even decades because of LTS distros. Not months, especially for things which have been around for a long while.