Thread (63 messages) flat view 63 messages, 6 authors, 2022-07-21

Re: [PATCH 6/8] git-svn: drop support for `--preserve-merges`

From: Eric Wong <hidden>
Date: 2019-11-23 22:09:54

Johannes Schindelin via GitGitGadget [off-list ref] wrote:
We already passed the `--rebase-merges` option to `git rebase` instead,
now we make this move permanent.
quoted hunk ↗ jump to hunk
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help