git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Eddy Petrișor" <eddy.petrisor@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] git svn: should not display zombie externals
Date: Tue, 12 Aug 2008 20:05:49 +0300	[thread overview]
Message-ID: <60381eeb0808121005h72ee6ef2g8a979d9f6875ee51@mail.gmail.com> (raw)
In-Reply-To: <48923E95.2020302@gmail.com>

2008/8/1 Eddy Petrișor <eddy.petrisor@gmail.com>:
>
> during the history of a repo a svn:external could be added and later
> removed; such externals shouldn't be displayed since only the current
> state is relevant
>
> I have encountered the broken behaviour on a git-svn repo with the svn
> origin a repo served via https (git 1:1.5.6-1~bpo40+1 from Debian Etch
> backports.) I hope this bug doesn't have to do with the svn repo being
> served via https.

I have finally found the root of this breakage. It seems that the
older versions of subversion allowed a svn:external property to be
empty, thus generating the zombie externals. Newer versions of
subversion (I checked this with 1.4.2 (r22196) from Debian Etch) do
not allow such empty svn:externals.

> Signed-off-by: Eddy Petrișor <eddy.petrisor@gmail.com>
> ---
>  t/t9101-git-svn-props.sh |   23 ++++++++++++++++++++++-
>  1 files changed, 22 insertions(+), 1 deletions(-)
>
> diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
> index f420796..e5ab748 100755
> --- a/t/t9101-git-svn-props.sh
> +++ b/t/t9101-git-svn-props.sh
> @@ -211,7 +211,28 @@ EOF
>
>  test_expect_success 'test proplist' "
>        git-svn proplist . | cmp - prop.expect &&
> -       git-svn proplist nested/directory/.keep | cmp - prop2.expect
> +       git-svn proplist nested/directory/.keep | cmp - prop2.expect &&
> +       cd ..
> +       "
> +
> +test_expect_success 'show external' "
> +       cd test_wc &&
> +               svn propset svn:externals 'zombie file:///fake/external' .
> &&
> +               svn ci -m 'added a fake svn:external' &&
> +       cd .. &&
> +       git-svn fetch &&
> +       git-merge git-svn &&
> +       git-svn show-externals | grep -q 'zombie'
> +       "
> +
> +test_expect_success 'remove external' "
> +       cd test_wc &&
> +               svn propdel svn:externals . &&
> +               svn ci -m 'deleted the fake external' &&
> +       cd .. &&
> +       git-svn fetch &&
> +       git-merge git-svn &&
> +       git-svn show-externals | grep -q -v 'zombie'
>        "
>
>  test_done
> --
> 1.5.6.3
>
>
> This one is properly formated (the previous one was a copy/paste from the
> output of the console).
>



-- 
Regards,
EddyP
=============================================
"Imagination is more important than knowledge" A.Einstein

  reply	other threads:[~2008-08-12 17:07 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-31 22:33 [PATCH] git svn: should not display zombie externals Eddy Petrișor
2008-07-31 22:37 ` Eddy Petrișor
2008-08-12 17:05   ` Eddy Petrișor [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-08-29  0:02 [PATCH 0/3] git-svn-externals PoC (in a sh script) Eddy Petrișor
2008-08-29  0:02 ` [PATCH] git svn: should not display zombie externals Eddy Petrișor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=60381eeb0808121005h72ee6ef2g8a979d9f6875ee51@mail.gmail.com \
    --to=eddy.petrisor@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).