Skip to contentSkip to conversation

git-svn not following svn moves

BUG cho 3 participants 7 messages Jun 15, 2016

lore
Share & tools
lore

cho

author
#0 lore raw

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 1 line

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

#1 lore raw
Quoted 14 lines · cho

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 1 line

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"

Quoted 7 lines

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

author
#2 lore raw

Le Thu, 18 Oct 2007 14:13:28 +0200, Peter Baumann a écrit :

Quoted 3 lines

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.

#3 lore raw
Quoted 26 lines · cho

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

Quoted 2 lines

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.

author
#4 lore raw

Le Fri, 19 Oct 2007 11:04:12 +1300, Sam Vilain a écrit :

Quoted 3 lines
Quoted 2 lines · cho

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 5 lines
Quoted 3 lines

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 .

author
#5 lore raw
In reply to Sam Vilain

Vendredi 19 Octobre 2007 à 11:04:12 +1300, Sam Vilain a écrit :

Quoted 2 lines
Quoted 1 line · cho

svn ci -m 'Add README.'

# forgot this:
svn up
Quoted 7 lines
Quoted 5 lines

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 .

author
#6 lore raw
In reply to Sam Vilain

Le Fri, 19 Oct 2007 11:04:12 +1300, Sam Vilain a écrit :

Quoted 2 lines
Quoted 1 line · cho

svn ci -m 'Add README.'

# forgot this
svn up
Quoted 4 lines
Quoted 2 lines

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 .