threads / patch / 5699

patchgit-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1

Subject: [PATCH] git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1

## tl;dr

2 messages between Sep 26, 2006 and Sep 26, 2006. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Sergey Vlasov· Sep 26, 2006, 09:42 UTC · lore

When using Subversion 1.3.1 without Perl bindings (GIT_SVN_NO_LIB=1), "git-svn fetch --no-ignore-externals" fails with errors like:

  Tree (.../.git/svn/git-svn/tree) is not clean:
  X      directory_with_external

In this case the 'X' lines in the "svn status" output are not a sign of unclean tree, and therefore should be ignored.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
---
 git-svn.perl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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

diff --git a/git-svn.perl b/git-svn.perl
index 0290850..2f5cf90 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1246,6 +1246,7 @@ sub assert_svn_wc_clean {
 	}
 	my @status = grep(!/^Performing status on external/,(`svn status`));
 	@status = grep(!/^\s*$/,@status);
+	@status = grep(!/^X/,@status) if $_no_ignore_ext;
 	if (scalar @status) {
 		print STDERR "Tree ($SVN_WC) is not clean:\n";
 		print STDERR $_ foreach @status;

-- 
1.4.2.1.ga8608c

Eric Wong· Sep 26, 2006, 18:14 UTC · re: Sergey Vlasov · lore

Re: [PATCH] git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1

Sergey Vlasov <vsu@altlinux.ru> wrote:

Show 10 quoted lines

> When using Subversion 1.3.1 without Perl bindings (GIT_SVN_NO_LIB=1),
> "git-svn fetch --no-ignore-externals" fails with errors like:
> 
>   Tree (.../.git/svn/git-svn/tree) is not clean:
>   X      directory_with_external
> 
> In this case the 'X' lines in the "svn status" output are not a sign
> of unclean tree, and therefore should be ignored.
> 
> Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>

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

-- 
Eric Wong