threads / patch / 17242

patchgit-svn: Show UUID in svn info for added directories with svn 1.5.5

Subject: [PATCH] git-svn: Show UUID in svn info for added directories with svn 1.5.5

## tl;dr

2 messages between Jan 19, 2009 and Jan 19, 2009. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Marcel Koeppen· Jan 19, 2009, 02:02 UTC · lore

In svn 1.5.5 the output of "svn info" for added directories was changed and now shows the repository UUID. This patch implements the same behavior for "git svn info" and makes t9119-git-svn-info.17 pass if svn 1.5.5 is used.

Signed-off-by: Marcel Koeppen <git-dev@marzelpan.de>
---
 git-svn.perl |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Show changes to git-svn.perl +2 −1

diff --git a/git-svn.perl b/git-svn.perl
index ad01e18..2f16a4e 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -911,7 +911,8 @@ sub cmd_info {
 	if ($@) {
 		$result .= "Repository Root: (offline)\n";
 	}
-	$result .= "Repository UUID: $uuid\n" unless $diff_status eq "A";
+	$result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
+		($SVN::Core::VERSION le '1.5.4' || $file_type ne "dir");
 	$result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
 
 	$result .= "Node Kind: " .

-- 
1.6.1.142.g76f25

Eric Wong· Jan 19, 2009, 03:04 UTC · re: Marcel Koeppen · lore

Re: [PATCH] git-svn: Show UUID in svn info for added directories with svn 1.5.5

Marcel Koeppen <git-dev@marzelpan.de> wrote:

Show 6 quoted lines

> In svn 1.5.5 the output of "svn info" for added directories was changed
> and now shows the repository UUID. This patch implements the same
> behavior for "git svn info" and makes t9119-git-svn-info.17 pass if
> svn 1.5.5 is used.
> 
> Signed-off-by: Marcel Koeppen <git-dev@marzelpan.de>

Thanks Marcel,
Acked-by: Eric Wong <normalperson@yhbt.net>

Show 19 quoted lines

> ---
>  git-svn.perl |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/git-svn.perl b/git-svn.perl
> index ad01e18..2f16a4e 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -911,7 +911,8 @@ sub cmd_info {
>  	if ($@) {
>  		$result .= "Repository Root: (offline)\n";
>  	}
> -	$result .= "Repository UUID: $uuid\n" unless $diff_status eq "A";
> +	$result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
> +		($SVN::Core::VERSION le '1.5.4' || $file_type ne "dir");
>  	$result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
>  
>  	$result .= "Node Kind: " .
> --