{"thread":{"id":"10357","subject":"[BUG] git-svn not following svn moves","startedAt":"2007-10-18T11:20:16Z","lastAt":"2007-10-19T08:30:51Z","messageCount":7,"participants":["cho","Peter Baumann","Sam Vilain"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"56385","messageId":"ff7fhg$2eu$1@ger.gmane.org","threadId":"10357","inReplyTo":null,"subject":"[BUG] git-svn not following svn moves","fromName":"cho","fromEmail":"tobutaz@gmail.com","sentAt":"2007-10-18T11:20:16Z","receivedAt":"2007-10-18T11:20:16Z","isPatch":false,"sender":{"key":"tobutaz@gmail.com","avatar":null},"body":"Hello,\n\nI have a git-svn checkout that apparently did not follow a move correctly.\nThe files are not present in an svn checkout, but are in a git svn clone.\n\nAccording to a trac browser, some of the files that appear in my git \ncheckout had in fact been moved to their separate branch before doing git-\nsvn clone. I noticed this when trying to commit changes to those files, \ngetting the error message:\n> Le système de fichiers ne contient pas cet élément: Fichier non \ntrouvé : transaction '3926-1', chemin '.../composants.py' at /home/marc/\nbin/git-svn line 2960\nIt's a standard subversion error, \"Filesystem has no item\"\n\nI've made a clean checkout (with today's 1.5.3.4.206.g58ba4), and I still \nhave the moved files present.\nThe clone command is just:\ngit svn clone --stdlayout svn+ssh://host/srv/subversion/proj/appli/proj\n\nTell me if I can give more info (the repository isn't public).\n"},{"id":"56391","messageId":"20071018121328.GA5358@xp.machine.xx","threadId":"10357","inReplyTo":"ff7fhg$2eu$1@ger.gmane.org","subject":"Re: [BUG] git-svn not following svn moves","fromName":"Peter Baumann","fromEmail":"waste.manager@gmx.de","sentAt":"2007-10-18T12:13:28Z","receivedAt":"2007-10-18T12:13:28Z","isPatch":false,"sender":{"key":"waste.manager@gmx.de","avatar":null},"body":"On Thu, Oct 18, 2007 at 11:20:16AM +0000, cho wrote:\n> Hello,\n> \n> I have a git-svn checkout that apparently did not follow a move correctly.\n> The files are not present in an svn checkout, but are in a git svn clone.\n> \n> According to a trac browser, some of the files that appear in my git \n> checkout had in fact been moved to their separate branch before doing git-\n> svn clone. I noticed this when trying to commit changes to those files, \n> getting the error message:\n> > Le système de fichiers ne contient pas cet élément: Fichier non \n> trouvé : transaction '3926-1', chemin '.../composants.py' at /home/marc/\n> bin/git-svn line 2960\n> It's a standard subversion error, \"Filesystem has no item\"\n> \n> I've made a clean checkout (with today's 1.5.3.4.206.g58ba4), and I still \n> have the moved files present.\n> The clone command is just:\n> git svn clone --stdlayout svn+ssh://host/srv/subversion/proj/appli/proj\n> \n> Tell me if I can give more info (the repository isn't public).\n> \n\nAny chance you could provide a testcase which is similar to what happened\nin your private repo so that the problem could be reproduced here?\n\n-Peter\n"},{"id":"56396","messageId":"ff7m2j$2eu$2@ger.gmane.org","threadId":"10357","inReplyTo":"20071018121328.GA5358@xp.machine.xx","subject":"Re: [BUG] git-svn not following svn moves","fromName":"cho","fromEmail":"tobutaz@gmail.com","sentAt":"2007-10-18T13:11:47Z","receivedAt":"2007-10-18T13:11:47Z","isPatch":false,"sender":{"key":"tobutaz@gmail.com","avatar":null},"body":"Le Thu, 18 Oct 2007 14:13:28 +0200, Peter Baumann a écrit :\n> Any chance you could provide a testcase which is similar to what\n> happened in your private repo so that the problem could be reproduced\n> here?\n\nI've surprised myself but yes, there is a simple testcase.\n\nsvnadmin create repo\nsvn checkout file://$PWD/repo checkout\ncd checkout/\nsvn mkdir trunk tags branches\nsvn ci -m 'Standard svn layout.'\ncd trunk/\nsvn mkdir doc\ntouch doc/README\nsvn add doc/README\nsvn ci -m 'Add README.'\ncd ..\nsvn mv trunk/ branches/oldtrunk\nsvn ci -m 'Moved trunk.'\nsvn mkdir trunk\nsvn ci -m 'New trunk.'\ncd trunk/\ntouch THIS_IS_THE_NEW_TRUNK\nsvn add THIS_IS_THE_NEW_TRUNK\nsvn ci -m 'Add marker.'\ncd ../..\ngit svn clone file://$PWD/repo --stdlayout git-clone\ncd git-clone/\ntree\n\nSo the testcase basically involves moving the trunk.\ngit-svn gets very confused and keeps a mixture of the old and new trunk.\n"},{"id":"56433","messageId":"4717D85C.9050805@vilain.net","threadId":"10357","inReplyTo":"ff7m2j$2eu$2@ger.gmane.org","subject":"Re: [BUG] git-svn not following svn moves","fromName":"Sam Vilain","fromEmail":"sam@vilain.net","sentAt":"2007-10-18T22:04:12Z","receivedAt":"2007-10-18T22:04:12Z","isPatch":false,"sender":{"key":"sam@vilain.net","avatar":"https://gravatar.com/avatar/8fc840ca854dbf6f7065b4335e3b934951c1dca3b11db688e95e471901f8f4a8?d=mp&s=160"},"body":"cho wrote:\n> I've surprised myself but yes, there is a simple testcase.\n> \n> svnadmin create repo\n> svn checkout file://$PWD/repo checkout\n> cd checkout/\n> svn mkdir trunk tags branches\n> svn ci -m 'Standard svn layout.'\n> cd trunk/\n> svn mkdir doc\n> touch doc/README\n> svn add doc/README\n> svn ci -m 'Add README.'\n> cd ..\n> svn mv trunk/ branches/oldtrunk\n> svn ci -m 'Moved trunk.'\n> svn mkdir trunk\n> svn ci -m 'New trunk.'\n> cd trunk/\n> touch THIS_IS_THE_NEW_TRUNK\n> svn add THIS_IS_THE_NEW_TRUNK\n> svn ci -m 'Add marker.'\n> cd ../..\n> git svn clone file://$PWD/repo --stdlayout git-clone\n> cd git-clone/\n> tree\n> \n> So the testcase basically involves moving the trunk.\n> git-svn gets very confused and keeps a mixture of the old and new trunk.\n\nWere you using --follow-parent or not?\n\nSam.\n"},{"id":"56544","messageId":"ff9nms$2eu$3@ger.gmane.org","threadId":"10357","inReplyTo":"4717D85C.9050805@vilain.net","subject":"Re: [BUG] git-svn not following svn moves","fromName":"cho","fromEmail":"tobutaz@gmail.com","sentAt":"2007-10-19T07:51:56Z","receivedAt":"2007-10-19T07:51:56Z","isPatch":false,"sender":{"key":"tobutaz@gmail.com","avatar":null},"body":"Le Fri, 19 Oct 2007 11:04:12 +1300, Sam Vilain a écrit :\n\n> cho wrote:\n>> I've surprised myself but yes, there is a simple testcase.\n>> \nsvnadmin create repo\nsvn checkout file://$PWD/repo checkout cd checkout/\nsvn mkdir trunk tags branches\nsvn ci -m 'Standard svn layout.'\ncd trunk/\nsvn mkdir doc\ntouch doc/README\nsvn add doc/README\nsvn ci -m 'Add README.'\n\n# forgot this, sorry\nsvn up\ncd ..\nsvn mv trunk/ branches/oldtrunk\nsvn ci -m 'Moved trunk.'\nsvn mkdir trunk\nsvn ci -m 'New trunk.'\ncd trunk/\ntouch THIS_IS_THE_NEW_TRUNK\nsvn add THIS_IS_THE_NEW_TRUNK\nsvn ci -m 'Add marker.'\ncd ../..\ngit svn clone file://$PWD/repo --stdlayout git-clone\ncd git-clone/\ntree\n\n>> \n>> So the testcase basically involves moving the trunk. git-svn gets very\n>> confused and keeps a mixture of the old and new trunk.\n> \n> Were you using --follow-parent or not?\n\nIt's the same whether I use --follow-parent or --no-follow-parent .\n"},{"id":"56545","messageId":"ff9p7m$2eu$4@ger.gmane.org","threadId":"10357","inReplyTo":"4717D85C.9050805@vilain.net","subject":"Re: [BUG] git-svn not following svn moves","fromName":"cho","fromEmail":"tobutaz@gmail.com","sentAt":"2007-10-19T08:17:58Z","receivedAt":"2007-10-19T08:17:58Z","isPatch":false,"sender":{"key":"tobutaz@gmail.com","avatar":null},"body":"Vendredi 19 Octobre 2007 à 11:04:12 +1300, Sam Vilain a écrit :\n\n> cho wrote:\n>> svn ci -m 'Add README.'\n# forgot this:\nsvn up\n\n>> cd ..\n>> svn mv trunk/ branches/oldtrunk\n>> \n>> So the testcase basically involves moving the trunk. git-svn gets very\n>> confused and keeps a mixture of the old and new trunk.\n> \n> Were you using --follow-parent or not?\n\nThe result is the same, whether I use --follow-parent\nor --no-follow-parent .\n"},{"id":"56543","messageId":"pan.2007.10.19.08.30.47@gmail.com","threadId":"10357","inReplyTo":"4717D85C.9050805@vilain.net","subject":"Re: [BUG] git-svn not following svn moves","fromName":"cho","fromEmail":"tobutaz@gmail.com","sentAt":"2007-10-19T08:30:51Z","receivedAt":"2007-10-19T08:30:51Z","isPatch":false,"sender":{"key":"tobutaz@gmail.com","avatar":null},"body":"Le Fri, 19 Oct 2007 11:04:12 +1300, Sam Vilain a écrit :\n\n> cho wrote:\n>> svn ci -m 'Add README.'\n# forgot this\nsvn up\n\n>> So the testcase basically involves moving the trunk. git-svn gets very\n>> confused and keeps a mixture of the old and new trunk.\n> \n> Were you using --follow-parent or not?\n\nIt's the same, with --follow-parent and with --no-follow-parent .\n"}]}