* [PATCH] git-svn.perl: close the edit for propedits even with no mods
@ 2011-12-01 2:37 Steven Walter
2011-12-06 1:10 ` Eric Wong
0 siblings, 1 reply; 3+ messages in thread
From: Steven Walter @ 2011-12-01 2:37 UTC (permalink / raw
To: rmalperson, git; +Cc: Steven Walter
It's legitimate to update the mergeinfo property without
actually changing any files. This can happen when changes are
backported to a branch, and then that branch is merged back
into mainline. We still want to record the updated mergeinfo
for book-keeping.
Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
---
git-svn.perl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 177dd25..cd64659 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -4867,7 +4867,7 @@ sub apply_diff {
$self->{mergeinfo});
}
$self->rmdirs if $_rmdir;
- if (@$mods == 0) {
+ if (@$mods == 0 && !defined($self->{mergeinfo})) {
$self->abort_edit;
} else {
$self->close_edit;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] git-svn.perl: close the edit for propedits even with no mods
2011-12-01 2:37 [PATCH] git-svn.perl: close the edit for propedits even with no mods Steven Walter
@ 2011-12-06 1:10 ` Eric Wong
2011-12-06 5:03 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Eric Wong @ 2011-12-06 1:10 UTC (permalink / raw
To: Steven Walter; +Cc: git
Steven Walter <stevenrwalter@gmail.com> wrote:
> It's legitimate to update the mergeinfo property without
> actually changing any files. This can happen when changes are
> backported to a branch, and then that branch is merged back
> into mainline. We still want to record the updated mergeinfo
> for book-keeping.
>
> Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Pushed to "master" of git://bogomips.org/git-svn.git
(Btw, you got my email address wrong in the Cc:)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] git-svn.perl: close the edit for propedits even with no mods
2011-12-06 1:10 ` Eric Wong
@ 2011-12-06 5:03 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2011-12-06 5:03 UTC (permalink / raw
To: Eric Wong; +Cc: Steven Walter, git
Eric Wong <normalperson@yhbt.net> writes:
> Steven Walter <stevenrwalter@gmail.com> wrote:
>> It's legitimate to update the mergeinfo property without
>> actually changing any files. This can happen when changes are
>> backported to a branch, and then that branch is merged back
>> into mainline. We still want to record the updated mergeinfo
>> for book-keeping.
>>
>> Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
>
> Acked-by: Eric Wong <normalperson@yhbt.net>
>
> Pushed to "master" of git://bogomips.org/git-svn.git
>
> (Btw, you got my email address wrong in the Cc:)
Pulled. Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-06 5:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-01 2:37 [PATCH] git-svn.perl: close the edit for propedits even with no mods Steven Walter
2011-12-06 1:10 ` Eric Wong
2011-12-06 5:03 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).