# [PATCH] git-svn.perl: close the edit for propedits even with no mods

3 messages from 2011-12-01 to 2011-12-06. Participants: Steven Walter, Eric Wong, Junio C Hamano.
Thread: https://gitlist.dev/t/29059

## Steven Walter, 2011-12-01 02:37

Subject: [PATCH] git-svn.perl: close the edit for propedits even with no mods
Message-ID: <1322707047-24227-1-git-send-email-stevenrwalter@gmail.com>
URL: https://gitlist.dev/e/1322707047-24227-1-git-send-email-stevenrwalter%40gmail.com

```
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

```

## Eric Wong, 2011-12-06 01:10

Subject: Re: [PATCH] git-svn.perl: close the edit for propedits even with no mods
Message-ID: <20111206011036.GA26704@dcvr.yhbt.net>
URL: https://gitlist.dev/e/20111206011036.GA26704%40dcvr.yhbt.net
In-Reply-To: <1322707047-24227-1-git-send-email-stevenrwalter@gmail.com>

```
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:)

```

## Junio C Hamano, 2011-12-06 05:03

Subject: Re: [PATCH] git-svn.perl: close the edit for propedits even with no mods
Message-ID: <7v4nxei94z.fsf@alter.siamese.dyndns.org>
URL: https://gitlist.dev/e/7v4nxei94z.fsf%40alter.siamese.dyndns.org
In-Reply-To: <20111206011036.GA26704@dcvr.yhbt.net>

```
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.

```