{"thread":{"id":"30533","subject":"RE: [PATCH] git-svn: support rebase --preserve-merges","startedAt":"2012-05-15T12:09:18Z","lastAt":"2012-05-22T17:32:25Z","messageCount":2,"participants":["Avishay Lavie","Steven Walter"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"191546","messageId":"CAHkK2boS2ffnz+vz1jRqKHy1vQcrcd6FHEdWgY-btHZaCapdkA@mail.gmail.com","threadId":"30533","inReplyTo":null,"subject":"RE: [PATCH] git-svn: support rebase --preserve-merges","fromName":"Avishay Lavie","fromEmail":"avishay.lavie@gmail.com","sentAt":"2012-05-15T12:09:18Z","receivedAt":"2012-05-15T12:09:18Z","isPatch":true,"sender":{"key":"avishay.lavie@gmail.com","avatar":"https://avatars.githubusercontent.com/u/557935?v=4"},"body":"(Adding previous authors of git-svn.perl)\n\n---------- Forwarded message ----------\nFrom: Avishay Lavie \nDate: Tue, May 15, 2012 at 12:09 PM\nSubject: PATCH: git-svn: support rebase --preserve-merges\nTo: git@vger.kernel.org\n\n\nFrom: Avishay Lavie \nDate: Tue, 15 May 2012 11:45:50 +0300\nSubject: [PATCH] git-svn: support rebase --preserve-merges\n\nWhen git svn rebase is performed after an unpushed merge, the\nrebase operation follows both parents and replays both the user's\nlocal commits and those from the merged branch. This is usually\nnot the intended behavior.\nThis patch adds support for the --preserve-merges/-p flag which\nallows for a better workflow by re-applying merge commits as merges.\n\nSigned-off-by: Avishay Lavie \n---\n Documentation/git-svn.txt |    2 ++\n git-svn.perl              |    4 +++-\n 2 files changed, 5 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex 34ee785..0d52997 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -572,6 +572,8 @@ config key: svn.repackflags\n --merge::\n -s::\n --strategy=::\n+-p::\n+--preserve-merges::\n       These 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 ca038ec..e86d60b 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -84,7 +84,7 @@ my ($_stdin, $_help, $_edit,\n       $_message, $_file, $_branch_dest,\n       $_template, $_shared,\n       $_version, $_fetch_all, $_no_rebase, $_fetch_parent,\n-       $_merge, $_strategy, $_dry_run, $_local,\n+       $_merge, $_strategy, $_preserve_merges, $_dry_run, $_local,\n       $_prefix, $_no_checkout, $_url, $_verbose,\n       $_git_format, $_commit_url, $_tag, $_merge_info, $_interactive);\n $Git::SVN::_follow_parent = 1;\n@@ -233,6 +233,7 @@ my %cmd = (\n                         'local|l' => \\$_local,\n                         'fetch-all|all' => \\$_fetch_all,\n                         'dry-run|n' => \\$_dry_run,\n+                         'preserve-merges|p' => \\$_preserve_merges\n                         %fc_opts } ],\n       'commit-diff' => [ \\&cmd_commit_diff,\n                          'Commit a diff between two trees',\n@@ -1570,6 +1571,7 @@ sub rebase_cmd {\n       push @cmd, '-v' if $_verbose;\n       push @cmd, qw/--merge/ if $_merge;\n       push @cmd, \"--strategy=$_strategy\" if $_strategy;\n+       push @cmd, \"--preserve-merges\" if $_preserve_merges;\n       @cmd;\n }\n\n--\n1.7.9.msysgit.0\n"},{"id":"191906","messageId":"CAK8d-aLFr3Bk6LU-H8FgR8kKQM9sLvectneZ1QnaHDzg_08P-g@mail.gmail.com","threadId":"30533","inReplyTo":"CAHkK2boS2ffnz+vz1jRqKHy1vQcrcd6FHEdWgY-btHZaCapdkA@mail.gmail.com","subject":"Re: [PATCH] git-svn: support rebase --preserve-merges","fromName":"Steven Walter","fromEmail":"stevenrwalter@gmail.com","sentAt":"2012-05-22T17:32:25Z","receivedAt":"2012-05-22T17:32:25Z","isPatch":true,"sender":{"key":"stevenrwalter@gmail.com","avatar":"https://avatars.githubusercontent.com/u/79127?v=4"},"body":"Signed-Off-By: Steven Walter \n\nOn Tue, May 15, 2012 at 8:09 AM, Avishay Lavie wrote:\n> (Adding previous authors of git-svn.perl)\n>\n> ---------- Forwarded message ----------\n> From: Avishay Lavie \n> Date: Tue, May 15, 2012 at 12:09 PM\n> Subject: PATCH: git-svn: support rebase --preserve-merges\n> To: git@vger.kernel.org\n>\n>\n> From: Avishay Lavie \n> Date: Tue, 15 May 2012 11:45:50 +0300\n> Subject: [PATCH] git-svn: support rebase --preserve-merges\n>\n> When git svn rebase is performed after an unpushed merge, the\n> rebase operation follows both parents and replays both the user's\n> local commits and those from the merged branch. This is usually\n> not the intended behavior.\n> This patch adds support for the --preserve-merges/-p flag which\n> allows for a better workflow by re-applying merge commits as merges.\n>\n> Signed-off-by: Avishay Lavie \n> ---\n>  Documentation/git-svn.txt |    2 ++\n>  git-svn.perl              |    4 +++-\n>  2 files changed, 5 insertions(+), 1 deletions(-)\n>\n> diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\n> index 34ee785..0d52997 100644\n> --- a/Documentation/git-svn.txt\n> +++ b/Documentation/git-svn.txt\n> @@ -572,6 +572,8 @@ config key: svn.repackflags\n>  --merge::\n>  -s::\n>  --strategy=::\n> +-p::\n> +--preserve-merges::\n>        These are only used with the 'dcommit' and 'rebase' commands.\n>  +\n>  Passed directly to 'git rebase' when using 'dcommit' if a\n> diff --git a/git-svn.perl b/git-svn.perl\n> index ca038ec..e86d60b 100755\n> --- a/git-svn.perl\n> +++ b/git-svn.perl\n> @@ -84,7 +84,7 @@ my ($_stdin, $_help, $_edit,\n>        $_message, $_file, $_branch_dest,\n>        $_template, $_shared,\n>        $_version, $_fetch_all, $_no_rebase, $_fetch_parent,\n> -       $_merge, $_strategy, $_dry_run, $_local,\n> +       $_merge, $_strategy, $_preserve_merges, $_dry_run, $_local,\n>        $_prefix, $_no_checkout, $_url, $_verbose,\n>        $_git_format, $_commit_url, $_tag, $_merge_info, $_interactive);\n>  $Git::SVN::_follow_parent = 1;\n> @@ -233,6 +233,7 @@ my %cmd = (\n>                          'local|l' => \\$_local,\n>                          'fetch-all|all' => \\$_fetch_all,\n>                          'dry-run|n' => \\$_dry_run,\n> +                         'preserve-merges|p' => \\$_preserve_merges\n>                          %fc_opts } ],\n>        'commit-diff' => [ \\&cmd_commit_diff,\n>                           'Commit a diff between two trees',\n> @@ -1570,6 +1571,7 @@ sub rebase_cmd {\n>        push @cmd, '-v' if $_verbose;\n>        push @cmd, qw/--merge/ if $_merge;\n>        push @cmd, \"--strategy=$_strategy\" if $_strategy;\n> +       push @cmd, \"--preserve-merges\" if $_preserve_merges;\n>        @cmd;\n>  }\n>\n> --\n> 1.7.9.msysgit.0\n\n\n\n-- \n-Steven Walter \n\"The rotter who simpers that he sees no difference between the power\nof the dollar and the power of the whip, ought to learn the difference\non his own hide.\"\n    -Francisco d'Anconia, Atlas Shrugged\n"}]}