* [PATCH] git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1
@ 2006-09-26 9:42 Sergey Vlasov
2006-09-26 18:14 ` Eric Wong
0 siblings, 1 reply; 2+ messages in thread
From: Sergey Vlasov @ 2006-09-26 9:42 UTC (permalink / raw)
To: Eric Wong; +Cc: git, Sergey Vlasov
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1
2006-09-26 9:42 [PATCH] git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1 Sergey Vlasov
@ 2006-09-26 18:14 ` Eric Wong
0 siblings, 0 replies; 2+ messages in thread
From: Eric Wong @ 2006-09-26 18:14 UTC (permalink / raw)
To: Sergey Vlasov; +Cc: git
Sergey Vlasov <vsu@altlinux.ru> wrote:
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-09-26 18:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-26 9:42 [PATCH] git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1 Sergey Vlasov
2006-09-26 18:14 ` Eric Wong
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 NNTP newsgroup(s).