{"thread":{"id":"11450","subject":"[PATCH] git-svn: allow dcommit --no-rebase to commit multiple, dependent changes","startedAt":"2008-01-02T18:09:49Z","lastAt":"2008-01-02T18:09:49Z","messageCount":1,"participants":["Eric Wong"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"64340","messageId":"1199297389-20007-1-git-send-email-normalperson@yhbt.net","threadId":"11450","inReplyTo":null,"subject":"[PATCH] git-svn: allow dcommit --no-rebase to commit multiple, dependent changes","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2008-01-02T18:09:49Z","receivedAt":"2008-01-02T18:09:49Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Signed-off-by: Eric Wong <normalperson@yhbt.net>\n---\n git-svn.perl |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex c51f1e7..9b1113a 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -418,7 +418,7 @@ sub cmd_dcommit {\n \t\twarn \"Attempting to commit more than one change while \",\n \t\t     \"--no-rebase is enabled.\\n\",\n \t\t     \"If these changes depend on each other, re-running \",\n-\t\t     \"without --no-rebase will be required.\"\n+\t\t     \"without --no-rebase may be required.\"\n \t}\n \twhile (1) {\n \t\tmy $d = shift @$linear_refs or last;\n@@ -453,6 +453,7 @@ sub cmd_dcommit {\n \t\t\t\t                               $parents->{$d};\n \t\t\t}\n \t\t\t$_fetch_all ? $gs->fetch_all : $gs->fetch;\n+\t\t\t$last_rev = $cmt_rev;\n \t\t\tnext if $_no_rebase;\n \n \t\t\t# we always want to rebase against the current HEAD,\n@@ -512,7 +513,6 @@ sub cmd_dcommit {\n \t\t\t\t$parents = \\%p;\n \t\t\t\t$linear_refs = \\@l;\n \t\t\t}\n-\t\t\t$last_rev = $cmt_rev;\n \t\t}\n \t}\n \tunlink $gs->{index};\n-- \n1.5.4.rc2.7.g6277-dirty\n"}]}