[BUG] git-svn not following svn moves

7 messages, 3 authors, 2016-06-15 · open the first message on its own page

[BUG] git-svn not following svn moves

From: cho <hidden>
Date: 2016-06-15 22:43:42

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).

Re: [BUG] git-svn not following svn moves

From: Peter Baumann <hidden>
Date: 2016-06-15 22:43:42

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:
quoted
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

Re: [BUG] git-svn not following svn moves

From: cho <hidden>
Date: 2016-06-15 22:43:42

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.

Re: [BUG] git-svn not following svn moves

From: Sam Vilain <hidden>
Date: 2016-06-15 22:43:42

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.

Re: [BUG] git-svn not following svn moves

From: cho <hidden>
Date: 2016-06-15 22:43:43

Le Fri, 19 Oct 2007 11:04:12 +1300, Sam Vilain a écrit :
cho wrote:
quoted
svn ci -m 'Add README.'
# forgot this
svn up
quoted
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 .

Re: [BUG] git-svn not following svn moves

From: cho <hidden>
Date: 2016-06-15 22:43:43

Le Fri, 19 Oct 2007 11:04:12 +1300, Sam Vilain a écrit :
cho wrote:
quoted
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
quoted
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 .

Re: [BUG] git-svn not following svn moves

From: cho <hidden>
Date: 2016-06-15 22:43:43

Vendredi 19 Octobre 2007 à 11:04:12 +1300, Sam Vilain a écrit :
cho wrote:
quoted
svn ci -m 'Add README.'
# forgot this:
svn up
quoted
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 .
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help