{"thread":{"id":"29059","subject":"[PATCH] git-svn.perl: close the edit for propedits even with no mods","startedAt":"2011-12-01T02:37:27Z","lastAt":"2011-12-06T05:03:56Z","messageCount":3,"participants":["Steven Walter","Eric Wong","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"180188","messageId":"1322707047-24227-1-git-send-email-stevenrwalter@gmail.com","threadId":"29059","inReplyTo":null,"subject":"[PATCH] git-svn.perl: close the edit for propedits even with no mods","fromName":"Steven Walter","fromEmail":"stevenrwalter@gmail.com","sentAt":"2011-12-01T02:37:27Z","receivedAt":"2011-12-01T02:37:27Z","isPatch":true,"sender":{"key":"stevenrwalter@gmail.com","avatar":"https://avatars.githubusercontent.com/u/79127?v=4"},"body":"It's legitimate to update the mergeinfo property without\nactually changing any files.  This can happen when changes are\nbackported to a branch, and then that branch is merged back\ninto mainline.  We still want to record the updated mergeinfo\nfor book-keeping.\n\nSigned-off-by: Steven Walter <stevenrwalter@gmail.com>\n---\n git-svn.perl |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex 177dd25..cd64659 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -4867,7 +4867,7 @@ sub apply_diff {\n \t\t\t               $self->{mergeinfo});\n \t}\n \t$self->rmdirs if $_rmdir;\n-\tif (@$mods == 0) {\n+\tif (@$mods == 0 && !defined($self->{mergeinfo})) {\n \t\t$self->abort_edit;\n \t} else {\n \t\t$self->close_edit;\n-- \n1.7.5.4\n"},{"id":"180330","messageId":"20111206011036.GA26704@dcvr.yhbt.net","threadId":"29059","inReplyTo":"1322707047-24227-1-git-send-email-stevenrwalter@gmail.com","subject":"Re: [PATCH] git-svn.perl: close the edit for propedits even with no mods","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2011-12-06T01:10:36Z","receivedAt":"2011-12-06T01:10:36Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Steven Walter <stevenrwalter@gmail.com> wrote:\n> It's legitimate to update the mergeinfo property without\n> actually changing any files.  This can happen when changes are\n> backported to a branch, and then that branch is merged back\n> into mainline.  We still want to record the updated mergeinfo\n> for book-keeping.\n> \n> Signed-off-by: Steven Walter <stevenrwalter@gmail.com>\n\nAcked-by: Eric Wong <normalperson@yhbt.net>\n\nPushed to \"master\" of git://bogomips.org/git-svn.git\n\n(Btw, you got my email address wrong in the Cc:)\n"},{"id":"180339","messageId":"7v4nxei94z.fsf@alter.siamese.dyndns.org","threadId":"29059","inReplyTo":"20111206011036.GA26704@dcvr.yhbt.net","subject":"Re: [PATCH] git-svn.perl: close the edit for propedits even with no mods","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-12-06T05:03:56Z","receivedAt":"2011-12-06T05:03:56Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Wong <normalperson@yhbt.net> writes:\n\n> Steven Walter <stevenrwalter@gmail.com> wrote:\n>> It's legitimate to update the mergeinfo property without\n>> actually changing any files.  This can happen when changes are\n>> backported to a branch, and then that branch is merged back\n>> into mainline.  We still want to record the updated mergeinfo\n>> for book-keeping.\n>> \n>> Signed-off-by: Steven Walter <stevenrwalter@gmail.com>\n>\n> Acked-by: Eric Wong <normalperson@yhbt.net>\n>\n> Pushed to \"master\" of git://bogomips.org/git-svn.git\n>\n> (Btw, you got my email address wrong in the Cc:)\n\nPulled. Thanks.\n"}]}