{"thread":{"id":"52318","subject":"[PATCH 0/1] git svn: use rebase --rebase-merges instead of preserve-merges","startedAt":"2019-11-22T22:59:33Z","lastAt":"2019-11-23T00:08:31Z","messageCount":3,"participants":["Johannes Schindelin via GitGitGadget","Eric Wong"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"386873","messageId":"pull.295.git.1574463569.gitgitgadget@gmail.com","threadId":"52318","inReplyTo":null,"subject":"[PATCH 0/1] git svn: use rebase --rebase-merges instead of preserve-merges","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-22T22:59:28Z","receivedAt":"2019-11-22T22:59:33Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"By now, git rebase -r is on par with git rebase -p (or better), at least as\nfar as git svn's usage is concerned. So let's use the former instead of the\n(deprecated) latter option.\n\nJohannes Schindelin (1):\n git svn: stop using `rebase --preserve-merges`\n\n Documentation/git-svn.txt | 3 ++-\n git-svn.perl | 9 +++++----\n 2 files changed, 7 insertions(+), 5 deletions(-)\n\n\nbase-commit: d9f6f3b6195a0ca35642561e530798ad1469bd41\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-295%2Fdscho%2Fuse-rebase-r-in-git-svn-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-295/dscho/use-rebase-r-in-git-svn-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/295\n-- \ngitgitgadget\n"},{"id":"386874","messageId":"c123d93ae7361b53b9d1d76124aefcb09740f0eb.1574463569.git.gitgitgadget@gmail.com","threadId":"52318","inReplyTo":"pull.295.git.1574463569.gitgitgadget@gmail.com","subject":"[PATCH 1/1] git svn: stop using `rebase --preserve-merges`","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-22T22:59:29Z","receivedAt":"2019-11-22T22:59:34Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nWe deprecated `--preserve-merges` in favor of `--rebase-merges`; Let's\nreflect that in `git svn`.\n\nNote: Even when the user asks for `--preserve-merges`, we now silently\npass `--rebase-merges` to `git rebase` instead. Technically, this is a\nchange of behavior. But practically, `git svn` only ever asks for a\nnon-interactive rebase, and `--preserve-merges` and `--rebase-merges`\nare on par with regard to that.\n\nSigned-off-by: Johannes Schindelin \n---\n Documentation/git-svn.txt | 3 ++-\n git-svn.perl | 9 +++++----\n 2 files changed, 7 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex 53774f5b64..6624a14fbd 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -677,7 +677,8 @@ config key: svn.authorsProg\n -s::\n --strategy=::\n -p::\n---preserve-merges::\n+--rebase-merges::\n+--preserve-merges (DEPRECATED)::\n \tThese are only used with the 'dcommit' and 'rebase' commands.\n +\n Passed directly to 'git rebase' when using 'dcommit' if a\ndiff --git a/git-svn.perl b/git-svn.perl\nindex 050f2a36f4..4aa208ff5f 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -110,7 +110,7 @@ sub _req_svn {\n \t$_template, $_shared,\n \t$_version, $_fetch_all, $_no_rebase, $_fetch_parent,\n \t$_before, $_after,\n-\t$_merge, $_strategy, $_preserve_merges, $_dry_run, $_parents, $_local,\n+\t$_merge, $_strategy, $_rebase_merges, $_dry_run, $_parents, $_local,\n \t$_prefix, $_no_checkout, $_url, $_verbose,\n \t$_commit_url, $_tag, $_merge_info, $_interactive, $_set_svn_props);\n \n@@ -270,7 +270,8 @@ sub _req_svn {\n \t\t\t 'local|l' => \\$_local,\n \t\t\t 'fetch-all|all' => \\$_fetch_all,\n \t\t\t 'dry-run|n' => \\$_dry_run,\n-\t\t\t 'preserve-merges|p' => \\$_preserve_merges,\n+\t\t\t 'rebase-merges|p' => \\$_rebase_merges,\n+\t\t\t 'preserve-merges|p' => \\$_rebase_merges,\n \t\t\t %fc_opts } ],\n \t'commit-diff' => [ \\&cmd_commit_diff,\n \t 'Commit a diff between two trees',\n@@ -1054,7 +1055,7 @@ sub cmd_dcommit {\n \t\t\t\t\t 'If you are attempting to commit ',\n \t\t\t\t\t \"merges, try running:\\n\\t\",\n \t\t\t\t\t 'git rebase --interactive',\n-\t\t\t\t\t '--preserve-merges ',\n+\t\t\t\t\t '--rebase-merges ',\n \t\t\t\t\t $gs->refname,\n \t\t\t\t\t \"\\nBefore dcommitting\";\n \t\t\t\t}\n@@ -1717,7 +1718,7 @@ sub rebase_cmd {\n \tpush @cmd, '-v' if $_verbose;\n \tpush @cmd, qw/--merge/ if $_merge;\n \tpush @cmd, \"--strategy=$_strategy\" if $_strategy;\n-\tpush @cmd, \"--preserve-merges\" if $_preserve_merges;\n+\tpush @cmd, \"--rebase-merges\" if $_rebase_merges;\n \t@cmd;\n }\n \n-- \ngitgitgadget\n"},{"id":"386879","messageId":"20191123000828.GA15493@dcvr","threadId":"52318","inReplyTo":"c123d93ae7361b53b9d1d76124aefcb09740f0eb.1574463569.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/1] git svn: stop using `rebase --preserve-merges`","fromName":"Eric Wong","fromEmail":"e@80x24.org","sentAt":"2019-11-23T00:08:28Z","receivedAt":"2019-11-23T00:08:31Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Johannes Schindelin via GitGitGadget wrote:\n> From: Johannes Schindelin \n> \n> We deprecated `--preserve-merges` in favor of `--rebase-merges`; Let's\n> reflect that in `git svn`.\n> \n> Note: Even when the user asks for `--preserve-merges`, we now silently\n> pass `--rebase-merges` to `git rebase` instead. Technically, this is a\n> change of behavior. But practically, `git svn` only ever asks for a\n> non-interactive rebase, and `--preserve-merges` and `--rebase-merges`\n> are on par with regard to that.\n\nI've never used --preserve-merges or --rebase-merges even with\nstandalone git; but this seems fine as there's no actual\nbehavior change...\n\n> Signed-off-by: Johannes Schindelin \n\nAcked-by: Eric Wong \n\nThanks.\n"}]}