* [BUG] git-svn not following svn moves
@ 2007-10-18 11:20 cho
2007-10-18 12:13 ` Peter Baumann
0 siblings, 1 reply; 7+ messages in thread
From: cho @ 2007-10-18 11:20 UTC (permalink / raw)
To: git
Hello,
I have a git-svn checkout that apparently did not follow a move correctly.
The files are not present in an svn checkout, but are in a git svn clone.
According to a trac browser, some of the files that appear in my git
checkout had in fact been moved to their separate branch before doing git-
svn clone. I noticed this when trying to commit changes to those files,
getting the error message:
> Le système de fichiers ne contient pas cet élément: Fichier non
trouvé : transaction '3926-1', chemin '.../composants.py' at /home/marc/
bin/git-svn line 2960
It's a standard subversion error, "Filesystem has no item"
I've made a clean checkout (with today's 1.5.3.4.206.g58ba4), and I still
have the moved files present.
The clone command is just:
git svn clone --stdlayout svn+ssh://host/srv/subversion/proj/appli/proj
Tell me if I can give more info (the repository isn't public).
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [BUG] git-svn not following svn moves
2007-10-18 11:20 [BUG] git-svn not following svn moves cho
@ 2007-10-18 12:13 ` Peter Baumann
2007-10-18 13:11 ` cho
0 siblings, 1 reply; 7+ messages in thread
From: Peter Baumann @ 2007-10-18 12:13 UTC (permalink / raw)
To: cho; +Cc: git
On Thu, Oct 18, 2007 at 11:20:16AM +0000, cho wrote:
> Hello,
>
> I have a git-svn checkout that apparently did not follow a move correctly.
> The files are not present in an svn checkout, but are in a git svn clone.
>
> According to a trac browser, some of the files that appear in my git
> checkout had in fact been moved to their separate branch before doing git-
> svn clone. I noticed this when trying to commit changes to those files,
> getting the error message:
> > Le système de fichiers ne contient pas cet élément: Fichier non
> trouvé : transaction '3926-1', chemin '.../composants.py' at /home/marc/
> bin/git-svn line 2960
> It's a standard subversion error, "Filesystem has no item"
>
> I've made a clean checkout (with today's 1.5.3.4.206.g58ba4), and I still
> have the moved files present.
> The clone command is just:
> git svn clone --stdlayout svn+ssh://host/srv/subversion/proj/appli/proj
>
> Tell me if I can give more info (the repository isn't public).
>
Any chance you could provide a testcase which is similar to what happened
in your private repo so that the problem could be reproduced here?
-Peter
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [BUG] git-svn not following svn moves
2007-10-18 12:13 ` Peter Baumann
@ 2007-10-18 13:11 ` cho
2007-10-18 22:04 ` Sam Vilain
0 siblings, 1 reply; 7+ messages in thread
From: cho @ 2007-10-18 13:11 UTC (permalink / raw)
To: git
Le Thu, 18 Oct 2007 14:13:28 +0200, Peter Baumann a écrit :
> Any chance you could provide a testcase which is similar to what
> happened in your private repo so that the problem could be reproduced
> here?
I've surprised myself but yes, there is a simple testcase.
svnadmin create repo
svn checkout file://$PWD/repo checkout
cd checkout/
svn mkdir trunk tags branches
svn ci -m 'Standard svn layout.'
cd trunk/
svn mkdir doc
touch doc/README
svn add doc/README
svn ci -m 'Add README.'
cd ..
svn mv trunk/ branches/oldtrunk
svn ci -m 'Moved trunk.'
svn mkdir trunk
svn ci -m 'New trunk.'
cd trunk/
touch THIS_IS_THE_NEW_TRUNK
svn add THIS_IS_THE_NEW_TRUNK
svn ci -m 'Add marker.'
cd ../..
git svn clone file://$PWD/repo --stdlayout git-clone
cd git-clone/
tree
So the testcase basically involves moving the trunk.
git-svn gets very confused and keeps a mixture of the old and new trunk.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [BUG] git-svn not following svn moves
2007-10-18 13:11 ` cho
@ 2007-10-18 22:04 ` Sam Vilain
2007-10-19 7:51 ` cho
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Sam Vilain @ 2007-10-18 22:04 UTC (permalink / raw)
To: cho; +Cc: git
cho wrote:
> I've surprised myself but yes, there is a simple testcase.
>
> svnadmin create repo
> svn checkout file://$PWD/repo checkout
> cd checkout/
> svn mkdir trunk tags branches
> svn ci -m 'Standard svn layout.'
> cd trunk/
> svn mkdir doc
> touch doc/README
> svn add doc/README
> svn ci -m 'Add README.'
> cd ..
> svn mv trunk/ branches/oldtrunk
> svn ci -m 'Moved trunk.'
> svn mkdir trunk
> svn ci -m 'New trunk.'
> cd trunk/
> touch THIS_IS_THE_NEW_TRUNK
> svn add THIS_IS_THE_NEW_TRUNK
> svn ci -m 'Add marker.'
> cd ../..
> git svn clone file://$PWD/repo --stdlayout git-clone
> cd git-clone/
> tree
>
> So the testcase basically involves moving the trunk.
> git-svn gets very confused and keeps a mixture of the old and new trunk.
Were you using --follow-parent or not?
Sam.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [BUG] git-svn not following svn moves
2007-10-18 22:04 ` Sam Vilain
@ 2007-10-19 7:51 ` cho
2007-10-19 8:17 ` cho
2007-10-19 8:30 ` cho
2 siblings, 0 replies; 7+ messages in thread
From: cho @ 2007-10-19 7:51 UTC (permalink / raw)
To: git
Le Fri, 19 Oct 2007 11:04:12 +1300, Sam Vilain a écrit :
> cho wrote:
>> I've surprised myself but yes, there is a simple testcase.
>>
svnadmin create repo
svn checkout file://$PWD/repo checkout cd checkout/
svn mkdir trunk tags branches
svn ci -m 'Standard svn layout.'
cd trunk/
svn mkdir doc
touch doc/README
svn add doc/README
svn ci -m 'Add README.'
# forgot this, sorry
svn up
cd ..
svn mv trunk/ branches/oldtrunk
svn ci -m 'Moved trunk.'
svn mkdir trunk
svn ci -m 'New trunk.'
cd trunk/
touch THIS_IS_THE_NEW_TRUNK
svn add THIS_IS_THE_NEW_TRUNK
svn ci -m 'Add marker.'
cd ../..
git svn clone file://$PWD/repo --stdlayout git-clone
cd git-clone/
tree
>>
>> So the testcase basically involves moving the trunk. git-svn gets very
>> confused and keeps a mixture of the old and new trunk.
>
> Were you using --follow-parent or not?
It's the same whether I use --follow-parent or --no-follow-parent .
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [BUG] git-svn not following svn moves
2007-10-18 22:04 ` Sam Vilain
2007-10-19 7:51 ` cho
@ 2007-10-19 8:17 ` cho
2007-10-19 8:30 ` cho
2 siblings, 0 replies; 7+ messages in thread
From: cho @ 2007-10-19 8:17 UTC (permalink / raw)
To: git
Vendredi 19 Octobre 2007 à 11:04:12 +1300, Sam Vilain a écrit :
> cho wrote:
>> svn ci -m 'Add README.'
# forgot this:
svn up
>> cd ..
>> svn mv trunk/ branches/oldtrunk
>>
>> So the testcase basically involves moving the trunk. git-svn gets very
>> confused and keeps a mixture of the old and new trunk.
>
> Were you using --follow-parent or not?
The result is the same, whether I use --follow-parent
or --no-follow-parent .
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [BUG] git-svn not following svn moves
2007-10-18 22:04 ` Sam Vilain
2007-10-19 7:51 ` cho
2007-10-19 8:17 ` cho
@ 2007-10-19 8:30 ` cho
2 siblings, 0 replies; 7+ messages in thread
From: cho @ 2007-10-19 8:30 UTC (permalink / raw)
To: git
Le Fri, 19 Oct 2007 11:04:12 +1300, Sam Vilain a écrit :
> cho wrote:
>> svn ci -m 'Add README.'
# forgot this
svn up
>> So the testcase basically involves moving the trunk. git-svn gets very
>> confused and keeps a mixture of the old and new trunk.
>
> Were you using --follow-parent or not?
It's the same, with --follow-parent and with --no-follow-parent .
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-10-19 8:32 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-18 11:20 [BUG] git-svn not following svn moves cho
2007-10-18 12:13 ` Peter Baumann
2007-10-18 13:11 ` cho
2007-10-18 22:04 ` Sam Vilain
2007-10-19 7:51 ` cho
2007-10-19 8:17 ` cho
2007-10-19 8:30 ` cho
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).