# [PATCH] git svn: should not display zombie externals 3 messages from 2008-07-31 to 2008-08-12. Participants: Eddy Petrișor. Thread: https://gitlist.dev/t/14782 ## Eddy Petrișor, 2008-07-31 22:33 Subject: [PATCH] git svn: should not display zombie externals Message-ID: <48923DAF.7070900@gmail.com> URL: https://gitlist.dev/e/48923DAF.7070900%40gmail.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. Signed-off-by: Eddy Petrișor --- 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 ``` ## Eddy Petrișor, 2008-07-31 22:37 Subject: [PATCH] git svn: should not display zombie externals Message-ID: <48923E95.2020302@gmail.com> URL: https://gitlist.dev/e/48923E95.2020302%40gmail.com In-Reply-To: <48923DAF.7070900@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. Signed-off-by: Eddy Petrișor --- 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). ``` ## Eddy Petrișor, 2008-08-12 17:05 Subject: Re: [PATCH] git svn: should not display zombie externals Message-ID: <60381eeb0808121005h72ee6ef2g8a979d9f6875ee51@mail.gmail.com> URL: https://gitlist.dev/e/60381eeb0808121005h72ee6ef2g8a979d9f6875ee51%40mail.gmail.com In-Reply-To: <48923E95.2020302@gmail.com> ``` 2008/8/1 Eddy Petrișor : > > 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 > --- > 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 ```