{"thread":{"id":"11216","subject":"git-svn init from Avogadro SVN repo - deleted files showing","startedAt":"2007-12-10T00:24:40Z","lastAt":"2007-12-15T16:35:03Z","messageCount":9,"participants":["Marcus D. Hanwell","Peter Baumann","Eric Wong","cho"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"62526","messageId":"475C8748.6000005@cryos.net","threadId":"11216","inReplyTo":null,"subject":"git-svn init from Avogadro SVN repo - deleted files showing","fromName":"Marcus D. Hanwell","fromEmail":"marcus@cryos.net","sentAt":"2007-12-10T00:24:40Z","receivedAt":"2007-12-10T00:24:40Z","isPatch":false,"sender":{"key":"marcus@cryos.net","avatar":null},"body":"Hi,\n\nI am quite new to git and git-svn but have been using both for my \ndevelopment work recently. I imported the Avogadro subversion repository \n(hosted on Sourceforge) using the following commands,\n\ngit svn init -t tags -b branches -T trunk \nhttps://avogadro.svn.sourceforge.net/svnroot/avogadro\n\ngit svn fetch\n\n\nThe files avogadro.pro and README in the trunk/ directory appear in my \nimported git repository but not in Avogadro subversion trunk. We also \nhad trunk/src/ and all its files/subdirectories appearing in the git \ncheckout but not in subversion trunk. We deleted this using git and git \nsvn which removed it from the git checkouts too after r858.\n\nI have been talking to Peter who confirmed this and pointed out that the \nrepo was reorganised several times in the past. Please CC me on replies \nas I am not on the list. There is a copy of my git repo at \nhttp://platinum.cryos.net/avogadro.git/ if you would rather skip the \nimport. Other than that everything has been working great. It would be \ngood to get rid of this bug if possible. Let me know if there is \nanything else I can do to help.\n\nThanks,\n\nMarcus\n"},{"id":"62562","messageId":"20071210104235.GA7521@xp.machine.xx","threadId":"11216","inReplyTo":"475C8748.6000005@cryos.net","subject":"Re: git-svn init from Avogadro SVN repo - deleted files showing","fromName":"Peter Baumann","fromEmail":"waste.manager@gmx.de","sentAt":"2007-12-10T10:42:35Z","receivedAt":"2007-12-10T10:42:35Z","isPatch":false,"sender":{"key":"waste.manager@gmx.de","avatar":null},"body":"On Sun, Dec 09, 2007 at 07:24:40PM -0500, Marcus D. Hanwell wrote:\n> Hi,\n>\n> I am quite new to git and git-svn but have been using both for my \n> development work recently. I imported the Avogadro subversion repository \n> (hosted on Sourceforge) using the following commands,\n>\n> git svn init -t tags -b branches -T trunk \n> https://avogadro.svn.sourceforge.net/svnroot/avogadro\n>\n> git svn fetch\n>\n>\n> The files avogadro.pro and README in the trunk/ directory appear in my \n> imported git repository but not in Avogadro subversion trunk. We also had \n> trunk/src/ and all its files/subdirectories appearing in the git checkout \n> but not in subversion trunk. We deleted this using git and git svn which \n> removed it from the git checkouts too after r858.\n>\n> I have been talking to Peter who confirmed this and pointed out that the \n> repo was reorganised several times in the past. Please CC me on replies as \n> I am not on the list. There is a copy of my git repo at \n> http://platinum.cryos.net/avogadro.git/ if you would rather skip the \n> import. Other than that everything has been working great. It would be good \n> to get rid of this bug if possible. Let me know if there is anything else I \n> can do to help.\n>\n\n[ Eric Cc'ed, as the author of git-svn ]\n\nI can confirm that this looks like an import problem.\n(e.g see svn log -v -r33:78 https://avogadro.svn.sourceforge.net/svnroot/avogadro)\n\nI did my analysis on the file /trunk/avogadro.pro, because the error\nhappens really early in the history so could just import up to revision 76\nto see what goes wrong. (The file gets never deleted in the import, as it\nshould be!)\n\n\n\ntrunk/avogadro.pro is added here:\n\n ------------------------------------------------------------------------\n r33 | dcurtis3 | 2006-08-21 07:34:10 +0200 (Mon, 21 Aug 2006) | 3 lines\n Changed paths:\n A /trunk/avogadro.pro\n\n Does a recursive build.\n\n\nHere the refactoring starts (a new directory not tracked by git is added):\n ------------------------------------------------------------------------\n r66 | dcurtis3 | 2007-01-03 06:42:45 +0100 (Wed, 03 Jan 2007) | 3 lines\n Changed paths:\n A /avogadro\n\n Making room for libavogadro.\n\n\n/branches is moved to /avogadro/branches\n ------------------------------------------------------------------------\n r67 | dcurtis3 | 2007-01-03 06:47:11 +0100 (Wed, 03 Jan 2007) | 3 lines\n Changed paths:\n A /avogadro/branches (from /branches:66)\n D /branches\n\n Making room for libavogadro\n\n\n\n\nERROR HAPPENS HERE:\n====================\n\n/trunk and /tags are moved, too.\n(/trunk/avogadro.pro becomes /avogadro/trunk/avogadro.pro):\n ------------------------------------------------------------------------\n r68 | dcurtis3 | 2007-01-03 06:47:34 +0100 (Wed, 03 Jan 2007) | 3 lines\n Changed paths:\n A /avogadro/tags (from /tags:66)\n A /avogadro/trunk (from /trunk:66)\n D /tags\n D /trunk\n\n Making room for libavogadro.\n\nThe above delete/move of trunk isn't recorded anywhere in the git svn import.\n'git-svn find-rev r66' doesn't produce any output!\nAnd later git-svn thinks that /trunk and all its files are still there, so\ne.g. /trunk/avogadro.pro stays in the repo forever.\n\n\n-Peter\n\nThis is just for consistency here and for anyone interested in further\nanalyses.\n\nHere is the rest of the import analyses I've done. Look how \"interesting\" the\nrepo is and how many times the files are moved.\n\n\n\n\n/libavogadro is added\n ------------------------------------------------------------------------\n r69 | dcurtis3 | 2007-01-03 06:50:58 +0100 (Wed, 03 Jan 2007) | 3 lines\n Changed paths:\n A /libavogadro\n A /libavogadro/CMakeLists.txt\n A /libavogadro/FindOpenBabel.cmake\n A /libavogadro/src\n A /libavogadro/src/CMakeLists.txt\n A /libavogadro/src/color.cpp\n A /libavogadro/src/color.h\n A /libavogadro/src/engine.h\n A /libavogadro/src/engines\n A /libavogadro/src/engines/CMakeLists.txt\n A /libavogadro/src/engines/ResidueSphereEngine.cpp\n A /libavogadro/src/engines/ResidueSphereEngine.h\n A /libavogadro/src/engines/SphereEngine.cpp\n A /libavogadro/src/engines/SphereEngine.h\n A /libavogadro/src/engines/StickEngine.cpp\n A /libavogadro/src/engines/StickEngine.h\n A /libavogadro/src/engines/WireframeEngine.cpp\n A /libavogadro/src/engines/WireframeEngine.h\n A /libavogadro/src/engines/bsengine.cpp\n A /libavogadro/src/engines/bsengine.h\n A /libavogadro/src/engines/vertexarray.cpp\n A /libavogadro/src/engines/vertexarray.h\n A /libavogadro/src/glwidget.cpp\n A /libavogadro/src/glwidget.h\n A /libavogadro/src/primitives.cpp\n A /libavogadro/src/primitives.h\n\n Added libavogadro.\n\n\nCreate /libavogadro/{trunk,branches,tags} and move anything below the\nformer /libavogadro into /libavogadro/trunk\n ------------------------------------------------------------------------\n r70 | dcurtis3 | 2007-01-03 06:53:13 +0100 (Wed, 03 Jan 2007) | 3 lines\n Changed paths:\n D /libavogadro/CMakeLists.txt\n D /libavogadro/FindOpenBabel.cmake\n A /libavogadro/branches\n D /libavogadro/src\n A /libavogadro/tags\n A /libavogadro/trunk\n A /libavogadro/trunk/CMakeLists.txt (from /libavogadro/CMakeLists.txt:69)\n A /libavogadro/trunk/FindOpenBabel.cmake (from /libavogadro/FindOpenBabel.cmake:69)\n A /libavogadro/trunk/src (from /libavogadro/src:69)\n\n Putting in trunk / branches / tags.\n\n\n ------------------------------------------------------------------------\n r72 | dcurtis3 | 2007-01-03 08:55:32 +0100 (Wed, 03 Jan 2007) | 3 lines\n Changed paths:\n A /avogadro/trunk/CMakeLists.txt\n A /avogadro/trunk/FindAvogadro.cmake\n A /avogadro/trunk/FindOpenBabel.cmake\n D /avogadro/trunk/src/Engine.h\n D /avogadro/trunk/src/GLWidget.cpp\n D /avogadro/trunk/src/GLWidget.h\n D /avogadro/trunk/src/MainWindow.cpp\n D /avogadro/trunk/src/MainWindow.h\n D /avogadro/trunk/src/Primitives.cpp\n D /avogadro/trunk/src/Primitives.h\n D /avogadro/trunk/src/Renderer.h\n D /avogadro/trunk/src/Tool.cpp\n D /avogadro/trunk/src/Tool.h\n D /avogadro/trunk/src/Views.cpp\n D /avogadro/trunk/src/Views.h\n D /avogadro/trunk/src/color.cpp\n D /avogadro/trunk/src/color.h\n D /avogadro/trunk/src/engines\n M /avogadro/trunk/src/main.cpp\n A /avogadro/trunk/src/mainwindow.cpp (from /avogadro/trunk/src/MainWindow.cpp:70)\n A /avogadro/trunk/src/mainwindow.h (from /avogadro/trunk/src/MainWindow.h:70)\n A /avogadro/trunk/src/tool.cpp (from /avogadro/trunk/src/Tool.cpp:70)\n A /avogadro/trunk/src/tool.h (from /avogadro/trunk/src/Tool.h:70)\n A /avogadro/trunk/untitled01.gpr\n\n Now uses libavogadro. Starting to think we should package this a\n little different.\n\n\n\nRenamed /libavogadro to /avogadro-lib\n ------------------------------------------------------------------------\n r73 | dcurtis3 | 2007-01-03 16:48:02 +0100 (Wed, 03 Jan 2007) | 3 lines\n Changed paths:\n A /avogadro-lib (from /libavogadro:72)\n D /libavogadro\n\n Refactor\n\n\nmv /avogadro/trunk/avogadro.pro /trunk/avogadro/avogadro.pro\n ------------------------------------------------------------------------\n r75 | dcurtis3 | 2007-01-03 20:49:35 +0100 (Wed, 03 Jan 2007) | 2 lines\n Changed paths:\n D /avogadro\n D /avogadro-lib\n A /branches\n A /tags\n A /trunk\n A /trunk/avogadro (from /avogadro/trunk:74)\n A /trunk/libavogadro (from /avogadro-lib/trunk:74)\n\n Moving things around. Conforming to a more KDE-like layout in SVN.\n I'm going nuts. SOrry\n"},{"id":"62565","messageId":"20071210114051.GC7521@xp.machine.xx","threadId":"11216","inReplyTo":"20071210104235.GA7521@xp.machine.xx","subject":"Re: git-svn init from Avogadro SVN repo - deleted files showing","fromName":"Peter Baumann","fromEmail":"waste.manager@gmx.de","sentAt":"2007-12-10T11:40:51Z","receivedAt":"2007-12-10T11:40:51Z","isPatch":false,"sender":{"key":"waste.manager@gmx.de","avatar":null},"body":"On Mon, Dec 10, 2007 at 11:42:35AM +0100, Peter Baumann wrote:\n> On Sun, Dec 09, 2007 at 07:24:40PM -0500, Marcus D. Hanwell wrote:\n> > Hi,\n> >\n> > I am quite new to git and git-svn but have been using both for my \n> > development work recently. I imported the Avogadro subversion repository \n> > (hosted on Sourceforge) using the following commands,\n> >\n> > git svn init -t tags -b branches -T trunk \n> > https://avogadro.svn.sourceforge.net/svnroot/avogadro\n> >\n> > git svn fetch\n> >\n> >\n> > The files avogadro.pro and README in the trunk/ directory appear in my \n> > imported git repository but not in Avogadro subversion trunk. We also had \n> > trunk/src/ and all its files/subdirectories appearing in the git checkout \n> > but not in subversion trunk. We deleted this using git and git svn which \n> > removed it from the git checkouts too after r858.\n> >\n> > I have been talking to Peter who confirmed this and pointed out that the \n> > repo was reorganised several times in the past. Please CC me on replies as \n> > I am not on the list. There is a copy of my git repo at \n> > http://platinum.cryos.net/avogadro.git/ if you would rather skip the \n> > import. Other than that everything has been working great. It would be good \n> > to get rid of this bug if possible. Let me know if there is anything else I \n> > can do to help.\n> >\n> \n> [ Eric Cc'ed, as the author of git-svn ]\n> \n> I can confirm that this looks like an import problem.\n> (e.g see svn log -v -r33:78 https://avogadro.svn.sourceforge.net/svnroot/avogadro)\n> \n> I did my analysis on the file /trunk/avogadro.pro, because the error\n> happens really early in the history so could just import up to revision 76\n> to see what goes wrong. (The file gets never deleted in the import, as it\n> should be!)\n> \n> \n> \n> trunk/avogadro.pro is added here:\n> \n> ------------------------------------------------------------------------\n> r33 | dcurtis3 | 2006-08-21 07:34:10 +0200 (Mon, 21 Aug 2006) | 3 lines\n> Changed paths:\n> A /trunk/avogadro.pro\n> \n> Does a recursive build.\n> \n> \n> Here the refactoring starts (a new directory not tracked by git is added):\n> ------------------------------------------------------------------------\n> r66 | dcurtis3 | 2007-01-03 06:42:45 +0100 (Wed, 03 Jan 2007) | 3 lines\n> Changed paths:\n> A /avogadro\n> \n> Making room for libavogadro.\n> \n> \n> /branches is moved to /avogadro/branches\n> ------------------------------------------------------------------------\n> r67 | dcurtis3 | 2007-01-03 06:47:11 +0100 (Wed, 03 Jan 2007) | 3 lines\n> Changed paths:\n> A /avogadro/branches (from /branches:66)\n> D /branches\n> \n> Making room for libavogadro\n> \n> \n> \n> \n> ERROR HAPPENS HERE:\n> ====================\n> \n> /trunk and /tags are moved, too.\n> (/trunk/avogadro.pro becomes /avogadro/trunk/avogadro.pro):\n> ------------------------------------------------------------------------\n> r68 | dcurtis3 | 2007-01-03 06:47:34 +0100 (Wed, 03 Jan 2007) | 3 lines\n> Changed paths:\n> A /avogadro/tags (from /tags:66)\n> A /avogadro/trunk (from /trunk:66)\n> D /tags\n> D /trunk\n> \n> Making room for libavogadro.\n> \n> The above delete/move of trunk isn't recorded anywhere in the git svn import.\n> 'git-svn find-rev r66' doesn't produce any output!\n\nSorry. I meant r67 and r68 instead of r66.\n\n> And later git-svn thinks that /trunk and all its files are still there, so\n> e.g. /trunk/avogadro.pro stays in the repo forever.\n> \n> \n> -Peter\n> \n> This is just for consistency here and for anyone interested in further\n> analyses.\n> \n> Here is the rest of the import analyses I've done. Look how \"interesting\" the\n> repo is and how many times the files are moved.\n> \n> \n> \n> \n> /libavogadro is added\n> ------------------------------------------------------------------------\n> r69 | dcurtis3 | 2007-01-03 06:50:58 +0100 (Wed, 03 Jan 2007) | 3 lines\n> Changed paths:\n> A /libavogadro\n> A /libavogadro/CMakeLists.txt\n> A /libavogadro/FindOpenBabel.cmake\n> A /libavogadro/src\n> A /libavogadro/src/CMakeLists.txt\n> A /libavogadro/src/color.cpp\n> A /libavogadro/src/color.h\n> A /libavogadro/src/engine.h\n> A /libavogadro/src/engines\n> A /libavogadro/src/engines/CMakeLists.txt\n> A /libavogadro/src/engines/ResidueSphereEngine.cpp\n> A /libavogadro/src/engines/ResidueSphereEngine.h\n> A /libavogadro/src/engines/SphereEngine.cpp\n> A /libavogadro/src/engines/SphereEngine.h\n> A /libavogadro/src/engines/StickEngine.cpp\n> A /libavogadro/src/engines/StickEngine.h\n> A /libavogadro/src/engines/WireframeEngine.cpp\n> A /libavogadro/src/engines/WireframeEngine.h\n> A /libavogadro/src/engines/bsengine.cpp\n> A /libavogadro/src/engines/bsengine.h\n> A /libavogadro/src/engines/vertexarray.cpp\n> A /libavogadro/src/engines/vertexarray.h\n> A /libavogadro/src/glwidget.cpp\n> A /libavogadro/src/glwidget.h\n> A /libavogadro/src/primitives.cpp\n> A /libavogadro/src/primitives.h\n> \n> Added libavogadro.\n> \n> \n> Create /libavogadro/{trunk,branches,tags} and move anything below the\n> former /libavogadro into /libavogadro/trunk\n> ------------------------------------------------------------------------\n> r70 | dcurtis3 | 2007-01-03 06:53:13 +0100 (Wed, 03 Jan 2007) | 3 lines\n> Changed paths:\n> D /libavogadro/CMakeLists.txt\n> D /libavogadro/FindOpenBabel.cmake\n> A /libavogadro/branches\n> D /libavogadro/src\n> A /libavogadro/tags\n> A /libavogadro/trunk\n> A /libavogadro/trunk/CMakeLists.txt (from /libavogadro/CMakeLists.txt:69)\n> A /libavogadro/trunk/FindOpenBabel.cmake (from /libavogadro/FindOpenBabel.cmake:69)\n> A /libavogadro/trunk/src (from /libavogadro/src:69)\n> \n> Putting in trunk / branches / tags.\n> \n> \n> ------------------------------------------------------------------------\n> r72 | dcurtis3 | 2007-01-03 08:55:32 +0100 (Wed, 03 Jan 2007) | 3 lines\n> Changed paths:\n> A /avogadro/trunk/CMakeLists.txt\n> A /avogadro/trunk/FindAvogadro.cmake\n> A /avogadro/trunk/FindOpenBabel.cmake\n> D /avogadro/trunk/src/Engine.h\n> D /avogadro/trunk/src/GLWidget.cpp\n> D /avogadro/trunk/src/GLWidget.h\n> D /avogadro/trunk/src/MainWindow.cpp\n> D /avogadro/trunk/src/MainWindow.h\n> D /avogadro/trunk/src/Primitives.cpp\n> D /avogadro/trunk/src/Primitives.h\n> D /avogadro/trunk/src/Renderer.h\n> D /avogadro/trunk/src/Tool.cpp\n> D /avogadro/trunk/src/Tool.h\n> D /avogadro/trunk/src/Views.cpp\n> D /avogadro/trunk/src/Views.h\n> D /avogadro/trunk/src/color.cpp\n> D /avogadro/trunk/src/color.h\n> D /avogadro/trunk/src/engines\n> M /avogadro/trunk/src/main.cpp\n> A /avogadro/trunk/src/mainwindow.cpp (from /avogadro/trunk/src/MainWindow.cpp:70)\n> A /avogadro/trunk/src/mainwindow.h (from /avogadro/trunk/src/MainWindow.h:70)\n> A /avogadro/trunk/src/tool.cpp (from /avogadro/trunk/src/Tool.cpp:70)\n> A /avogadro/trunk/src/tool.h (from /avogadro/trunk/src/Tool.h:70)\n> A /avogadro/trunk/untitled01.gpr\n> \n> Now uses libavogadro. Starting to think we should package this a\n> little different.\n> \n> \n> \n> Renamed /libavogadro to /avogadro-lib\n> ------------------------------------------------------------------------\n> r73 | dcurtis3 | 2007-01-03 16:48:02 +0100 (Wed, 03 Jan 2007) | 3 lines\n> Changed paths:\n> A /avogadro-lib (from /libavogadro:72)\n> D /libavogadro\n> \n> Refactor\n> \n> \n> mv /avogadro/trunk/avogadro.pro /trunk/avogadro/avogadro.pro\n> ------------------------------------------------------------------------\n> r75 | dcurtis3 | 2007-01-03 20:49:35 +0100 (Wed, 03 Jan 2007) | 2 lines\n> Changed paths:\n> D /avogadro\n> D /avogadro-lib\n> A /branches\n> A /tags\n> A /trunk\n> A /trunk/avogadro (from /avogadro/trunk:74)\n> A /trunk/libavogadro (from /avogadro-lib/trunk:74)\n> \n> Moving things around. Conforming to a more KDE-like layout in SVN.\n> I'm going nuts. SOrry\n"},{"id":"63037","messageId":"20071213164134.GD18433@soma","threadId":"11216","inReplyTo":"20071210104235.GA7521@xp.machine.xx","subject":"Re: git-svn init from Avogadro SVN repo - deleted files showing","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2007-12-13T16:41:34Z","receivedAt":"2007-12-13T16:41:34Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Peter Baumann wrote:\n> On Sun, Dec 09, 2007 at 07:24:40PM -0500, Marcus D. Hanwell wrote:\n> > Hi,\n> >\n> > I am quite new to git and git-svn but have been using both for my \n> > development work recently. I imported the Avogadro subversion repository \n> > (hosted on Sourceforge) using the following commands,\n> >\n> > git svn init -t tags -b branches -T trunk \n> > https://avogadro.svn.sourceforge.net/svnroot/avogadro\n> >\n> > git svn fetch\n> >\n> >\n> > The files avogadro.pro and README in the trunk/ directory appear in my \n> > imported git repository but not in Avogadro subversion trunk. We also had \n> > trunk/src/ and all its files/subdirectories appearing in the git checkout \n> > but not in subversion trunk. We deleted this using git and git svn which \n> > removed it from the git checkouts too after r858.\n> >\n> > I have been talking to Peter who confirmed this and pointed out that the \n> > repo was reorganised several times in the past. Please CC me on replies as \n> > I am not on the list. There is a copy of my git repo at \n> > http://platinum.cryos.net/avogadro.git/ if you would rather skip the \n> > import. Other than that everything has been working great. It would be good \n> > to get rid of this bug if possible. Let me know if there is anything else I \n> > can do to help.\n> >\n> \n> [ Eric Cc'ed, as the author of git-svn ]\n> \n> I can confirm that this looks like an import problem.\n> (e.g see svn log -v -r33:78 https://avogadro.svn.sourceforge.net/svnroot/avogadro)\n> \n> I did my analysis on the file /trunk/avogadro.pro, because the error\n> happens really early in the history so could just import up to revision 76\n> to see what goes wrong. (The file gets never deleted in the import, as it\n> should be!)\n> \n> \n> \n> trunk/avogadro.pro is added here:\n> \n> ------------------------------------------------------------------------\n> r33 | dcurtis3 | 2006-08-21 07:34:10 +0200 (Mon, 21 Aug 2006) | 3 lines\n> Changed paths:\n> A /trunk/avogadro.pro\n> \n> Does a recursive build.\n> \n> \n> Here the refactoring starts (a new directory not tracked by git is added):\n> ------------------------------------------------------------------------\n> r66 | dcurtis3 | 2007-01-03 06:42:45 +0100 (Wed, 03 Jan 2007) | 3 lines\n> Changed paths:\n> A /avogadro\n> \n> Making room for libavogadro.\n> \n> \n> /branches is moved to /avogadro/branches\n> ------------------------------------------------------------------------\n> r67 | dcurtis3 | 2007-01-03 06:47:11 +0100 (Wed, 03 Jan 2007) | 3 lines\n> Changed paths:\n> A /avogadro/branches (from /branches:66)\n> D /branches\n> \n> Making room for libavogadro\n> \n> \n> \n> \n> ERROR HAPPENS HERE:\n> ====================\n> \n> /trunk and /tags are moved, too.\n> (/trunk/avogadro.pro becomes /avogadro/trunk/avogadro.pro):\n> ------------------------------------------------------------------------\n> r68 | dcurtis3 | 2007-01-03 06:47:34 +0100 (Wed, 03 Jan 2007) | 3 lines\n> Changed paths:\n> A /avogadro/tags (from /tags:66)\n> A /avogadro/trunk (from /trunk:66)\n> D /tags\n> D /trunk\n> \n> Making room for libavogadro.\n> \n> The above delete/move of trunk isn't recorded anywhere in the git svn import.\n> 'git-svn find-rev r66' doesn't produce any output!\n> And later git-svn thinks that /trunk and all its files are still there, so\n> e.g. /trunk/avogadro.pro stays in the repo forever.\n\nHi,\n\nThanks for the analysis, Peter.\n\ngit-svn ignores deletions to the directory we're tracking in order to\nrepresent renames when the follow-parent case is hit.\n\nUnfortunately, this never took into account the directory we're tracking\nreappearing later in history. I'll try to have a fix later tonight or\nover the weekend.\n\n> mv /avogadro/trunk/avogadro.pro /trunk/avogadro/avogadro.pro\n> ------------------------------------------------------------------------\n> r75 | dcurtis3 | 2007-01-03 20:49:35 +0100 (Wed, 03 Jan 2007) | 2 lines\n> Changed paths:\n> D /avogadro\n> D /avogadro-lib\n> A /branches\n> A /tags\n> A /trunk\n> A /trunk/avogadro (from /avogadro/trunk:74)\n> A /trunk/libavogadro (from /avogadro-lib/trunk:74)\n> \n> Moving things around. Conforming to a more KDE-like layout in SVN.\n> I'm going nuts. SOrry\n\nInstead of handling the full delete of everything in r68, I think I'll\nmake it so importing r75 will clobber all the stuff in trunk/ we ignored\ndeleting in r68 before adding the contents of trunk/ in r75.\n\n-- \nEric Wong\n"},{"id":"63043","messageId":"20071213181312.GA4441@xp.machine.xx","threadId":"11216","inReplyTo":"20071213164134.GD18433@soma","subject":"Re: git-svn init from Avogadro SVN repo - deleted files showing","fromName":"Peter Baumann","fromEmail":"waste.manager@gmx.de","sentAt":"2007-12-13T18:13:12Z","receivedAt":"2007-12-13T18:13:12Z","isPatch":false,"sender":{"key":"waste.manager@gmx.de","avatar":null},"body":"On Thu, Dec 13, 2007 at 08:41:34AM -0800, Eric Wong wrote:\n> Peter Baumann wrote:\n> > On Sun, Dec 09, 2007 at 07:24:40PM -0500, Marcus D. Hanwell wrote:\n> > > Hi,\n> > >\n> > > I am quite new to git and git-svn but have been using both for my \n> > > development work recently. I imported the Avogadro subversion repository \n> > > (hosted on Sourceforge) using the following commands,\n> > >\n> > > git svn init -t tags -b branches -T trunk \n> > > https://avogadro.svn.sourceforge.net/svnroot/avogadro\n> > >\n> > > git svn fetch\n> > >\n> > >\n> > > The files avogadro.pro and README in the trunk/ directory appear in my \n> > > imported git repository but not in Avogadro subversion trunk. We also had \n> > > trunk/src/ and all its files/subdirectories appearing in the git checkout \n> > > but not in subversion trunk. We deleted this using git and git svn which \n> > > removed it from the git checkouts too after r858.\n> > >\n> > > I have been talking to Peter who confirmed this and pointed out that the \n> > > repo was reorganised several times in the past. Please CC me on replies as \n> > > I am not on the list. There is a copy of my git repo at \n> > > http://platinum.cryos.net/avogadro.git/ if you would rather skip the \n> > > import. Other than that everything has been working great. It would be good \n> > > to get rid of this bug if possible. Let me know if there is anything else I \n> > > can do to help.\n> > >\n> > \n> > [ Eric Cc'ed, as the author of git-svn ]\n> > \n> > I can confirm that this looks like an import problem.\n> > (e.g see svn log -v -r33:78 https://avogadro.svn.sourceforge.net/svnroot/avogadro)\n> > \n> > I did my analysis on the file /trunk/avogadro.pro, because the error\n> > happens really early in the history so could just import up to revision 76\n> > to see what goes wrong. (The file gets never deleted in the import, as it\n> > should be!)\n> > \n> > \n> > \n> > trunk/avogadro.pro is added here:\n> > \n> > ------------------------------------------------------------------------\n> > r33 | dcurtis3 | 2006-08-21 07:34:10 +0200 (Mon, 21 Aug 2006) | 3 lines\n> > Changed paths:\n> > A /trunk/avogadro.pro\n> > \n> > Does a recursive build.\n> > \n> > \n> > Here the refactoring starts (a new directory not tracked by git is added):\n> > ------------------------------------------------------------------------\n> > r66 | dcurtis3 | 2007-01-03 06:42:45 +0100 (Wed, 03 Jan 2007) | 3 lines\n> > Changed paths:\n> > A /avogadro\n> > \n> > Making room for libavogadro.\n> > \n> > \n> > /branches is moved to /avogadro/branches\n> > ------------------------------------------------------------------------\n> > r67 | dcurtis3 | 2007-01-03 06:47:11 +0100 (Wed, 03 Jan 2007) | 3 lines\n> > Changed paths:\n> > A /avogadro/branches (from /branches:66)\n> > D /branches\n> > \n> > Making room for libavogadro\n> > \n> > \n> > \n> > \n> > ERROR HAPPENS HERE:\n> > ====================\n> > \n> > /trunk and /tags are moved, too.\n> > (/trunk/avogadro.pro becomes /avogadro/trunk/avogadro.pro):\n> > ------------------------------------------------------------------------\n> > r68 | dcurtis3 | 2007-01-03 06:47:34 +0100 (Wed, 03 Jan 2007) | 3 lines\n> > Changed paths:\n> > A /avogadro/tags (from /tags:66)\n> > A /avogadro/trunk (from /trunk:66)\n> > D /tags\n> > D /trunk\n> > \n> > Making room for libavogadro.\n> > \n> > The above delete/move of trunk isn't recorded anywhere in the git svn import.\n> > 'git-svn find-rev r66' doesn't produce any output!\n> > And later git-svn thinks that /trunk and all its files are still there, so\n> > e.g. /trunk/avogadro.pro stays in the repo forever.\n> \n> Hi,\n> \n> Thanks for the analysis, Peter.\n> \n> git-svn ignores deletions to the directory we're tracking in order to\n> represent renames when the follow-parent case is hit.\n> \n> Unfortunately, this never took into account the directory we're tracking\n> reappearing later in history. I'll try to have a fix later tonight or\n> over the weekend.\n> \n> > mv /avogadro/trunk/avogadro.pro /trunk/avogadro/avogadro.pro\n> > ------------------------------------------------------------------------\n> > r75 | dcurtis3 | 2007-01-03 20:49:35 +0100 (Wed, 03 Jan 2007) | 2 lines\n> > Changed paths:\n> > D /avogadro\n> > D /avogadro-lib\n> > A /branches\n> > A /tags\n> > A /trunk\n> > A /trunk/avogadro (from /avogadro/trunk:74)\n> > A /trunk/libavogadro (from /avogadro-lib/trunk:74)\n> > \n> > Moving things around. Conforming to a more KDE-like layout in SVN.\n> > I'm going nuts. SOrry\n> \n> Instead of handling the full delete of everything in r68, I think I'll\n> make it so importing r75 will clobber all the stuff in trunk/ we ignored\n> deleting in r68 before adding the contents of trunk/ in r75.\n> \n\nSorry, that last sentence I can't parse/understand. But I trust you to do the\nright thing.\n\n-Peter\n"},{"id":"63177","messageId":"20071214163909.GA18300@soma","threadId":"11216","inReplyTo":"20071213181312.GA4441@xp.machine.xx","subject":"[PATCH] git-svn: handle our top-level path is deleted and later re-added","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2007-12-14T16:39:09Z","receivedAt":"2007-12-14T16:39:09Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Previously, git-svn would ignore cases where the path we're\ntracking is removed from the repository. This was to prevent\nheads with follow-parent from ending up with a tree full of\nempty revisions (and thus breaking rename detection).\n\nThe previous behavior is fine until the path we're tracking\nis re-added later on, leading to the old files being merged\nin with the new files in the directory (because the old\nfiles were never marked as deleted)\n\nWe will now only remove all the old files locally that were\ndeleted remotely iff we detect the directory we're in is being\ncreated from scratch.\n\nThanks for Marcus D. Hanwell for the bug report and\nPeter Baumann for the analysis.\n\nSigned-off-by: Eric Wong \n---\n Peter Baumann wrote:\n > On Thu, Dec 13, 2007 at 08:41:34AM -0800, Eric Wong wrote:\n > > Peter Baumann wrote:\n > > > On Sun, Dec 09, 2007 at 07:24:40PM -0500, Marcus D. Hanwell wrote:\n > > > /trunk and /tags are moved, too.\n > > > (/trunk/avogadro.pro becomes /avogadro/trunk/avogadro.pro):\n > > > ------------------------------------------------------------------------\n > > > r68 | dcurtis3 | 2007-01-03 06:47:34 +0100 (Wed, 03 Jan 2007) | 3 lines\n > > > Changed paths:\n > > > A /avogadro/tags (from /tags:66)\n > > > A /avogadro/trunk (from /trunk:66)\n > > > D /tags\n > > > D /trunk\n > > > \n > > > Making room for libavogadro.\n > > > \n > > > The above delete/move of trunk isn't recorded anywhere in the git svn import.\n > > > 'git-svn find-rev r66' doesn't produce any output!\n > > > And later git-svn thinks that /trunk and all its files are still there, so\n > > > e.g. /trunk/avogadro.pro stays in the repo forever.\n > > \n > > Hi,\n > > \n > > Thanks for the analysis, Peter.\n > > \n > > git-svn ignores deletions to the directory we're tracking in order to\n > > represent renames when the follow-parent case is hit.\n > > \n > > Unfortunately, this never took into account the directory we're tracking\n > > reappearing later in history. I'll try to have a fix later tonight or\n > > over the weekend.\n > > \n > > > mv /avogadro/trunk/avogadro.pro /trunk/avogadro/avogadro.pro\n > > > ------------------------------------------------------------------------\n > > > r75 | dcurtis3 | 2007-01-03 20:49:35 +0100 (Wed, 03 Jan 2007) | 2 lines\n > > > Changed paths:\n > > > D /avogadro\n > > > D /avogadro-lib\n > > > A /branches\n > > > A /tags\n > > > A /trunk\n > > > A /trunk/avogadro (from /avogadro/trunk:74)\n > > > A /trunk/libavogadro (from /avogadro-lib/trunk:74)\n > > > \n > > > Moving things around. Conforming to a more KDE-like layout in SVN.\n > > > I'm going nuts. SOrry\n > > \n > > Instead of handling the full delete of everything in r68, I think I'll\n > > make it so importing r75 will clobber all the stuff in trunk/ we ignored\n > > deleting in r68 before adding the contents of trunk/ in r75.\n > > \n > \n > Sorry, that last sentence I can't parse/understand. But I trust you to do the\n > right thing.\n\n I hope the commit message was a better explanation. Or the code\n and test case I've added makes perfect sense :)\n\n git-svn.perl | 14 +++++++++\n t/t9103-git-svn-tracked-directory-removed.sh | 39 ++++++++++++++++++++++++++\n 2 files changed, 53 insertions(+), 0 deletions(-)\n create mode 100755 t/t9103-git-svn-tracked-directory-removed.sh\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex 3aa7f8c..d411a34 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -3045,6 +3045,20 @@ sub add_file {\n \n sub add_directory {\n \tmy ($self, $path, $cp_path, $cp_rev) = @_;\n+\tmy $gpath = $self->git_path($path);\n+\tif ($gpath eq '') {\n+\t\tmy ($ls, $ctx) = command_output_pipe(qw/ls-tree\n+\t\t -r --name-only -z/,\n+\t\t\t\t $self->{c});\n+\t\tlocal $/ = \"\\0\";\n+\t\twhile (<$ls>) {\n+\t\t\tchomp;\n+\t\t\t$self->{gii}->remove($_);\n+\t\t\tprint \"\\tD\\t$_\\n\" unless $::_q;\n+\t\t}\n+\t\tcommand_close_pipe($ls, $ctx);\n+\t\t$self->{empty}->{$path} = 0;\n+\t}\n \tmy ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);\n \tdelete $self->{empty}->{$dir};\n \t$self->{empty}->{$path} = 1;\ndiff --git a/t/t9103-git-svn-tracked-directory-removed.sh b/t/t9103-git-svn-tracked-directory-removed.sh\nnew file mode 100755\nindex 0000000..0f0b0fd\n--- /dev/null\n+++ b/t/t9103-git-svn-tracked-directory-removed.sh\n@@ -0,0 +1,39 @@\n+#!/bin/sh\n+#\n+# Copyright (c) 2007 Eric Wong\n+#\n+\n+test_description='git-svn tracking removed top-level path'\n+. ./lib-git-svn.sh\n+\n+test_expect_success 'make history for tracking' '\n+\tmkdir import &&\n+\tmkdir import/trunk &&\n+\techo hello >> import/trunk/README &&\n+\tsvn import -m initial import $svnrepo &&\n+\trm -rf import &&\n+\tsvn co $svnrepo/trunk trunk &&\n+\techo bye bye >> trunk/README &&\n+\tsvn rm -m \"gone\" $svnrepo/trunk &&\n+\trm -rf trunk &&\n+\tmkdir trunk &&\n+\techo \"new\" > trunk/FOLLOWME &&\n+\tsvn import -m \"new trunk\" trunk $svnrepo/trunk\n+'\n+\n+test_expect_success 'clone repo with git' '\n+\tgit svn clone -s $svnrepo x &&\n+\ttest -f x/FOLLOWME &&\n+\ttest ! -f x/README\n+'\n+\n+test_expect_success 'make sure r2 still has old file' '\n+\tcd x &&\n+\t\ttest -n \"$(git svn find-rev r1)\" &&\n+\t\tgit reset --hard $(git svn find-rev r1) &&\n+\t\ttest -f README &&\n+\t\ttest ! -f FOLLOWME &&\n+\t\ttest x$(git svn find-rev r2) = x\n+'\n+\n+test_done\n-- \nEric Wong\n"},{"id":"63178","messageId":"20071214164328.GA5213@hand.yhbt.net","threadId":"11216","inReplyTo":"20071214163909.GA18300@soma","subject":"Re: [PATCH] git-svn: handle our top-level path is deleted and later re-added","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2007-12-14T16:43:28Z","receivedAt":"2007-12-14T16:43:28Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"> Subject: [PATCH] git-svn: handle our top-level path is deleted and later re-added\n\nThat should read:\n\nSubject: [PATCH] git-svn: handle our top-level path being deleted and later re-added\n\n> ---\n> Peter Baumann wrote:\n> > On Thu, Dec 13, 2007 at 08:41:34AM -0800, Eric Wong wrote:\n\n> > > Instead of handling the full delete of everything in r68, I think I'll\n> > > make it so importing r75 will clobber all the stuff in trunk/ we ignored\n> > > deleting in r68 before adding the contents of trunk/ in r75.\n> > > \n> > \n> > Sorry, that last sentence I can't parse/understand. But I trust you to do the\n> > right thing.\n> \n> I hope the commit message was a better explanation. Or the code\n> and test case I've added makes perfect sense :)\n\nMy language generation module seems broken these days.\n\n-- \nEric Wong\n"},{"id":"63225","messageId":"fjv6s7$6ht$1@ger.gmane.org","threadId":"11216","inReplyTo":"20071214163909.GA18300@soma","subject":"Re: [PATCH] git-svn: handle our top-level path is deleted and later re-added","fromName":"cho","fromEmail":"tobutaz@gmail.com","sentAt":"2007-12-15T00:24:39Z","receivedAt":"2007-12-15T00:24:39Z","isPatch":true,"sender":{"key":"tobutaz@gmail.com","avatar":null},"body":"Thanks, this fixes a problem I had reported previously:\nhttp://permalink.gmane.org/gmane.comp.version-control.git/61516\n\nI'm not sure how I get to keep the git repository (branches) I previously \nhad, but it's not too bad.\n"},{"id":"63254","messageId":"20071215163503.GA25053@xp.machine.xx","threadId":"11216","inReplyTo":"20071214163909.GA18300@soma","subject":"Re: [PATCH] git-svn: handle our top-level path is deleted and later re-added","fromName":"Peter Baumann","fromEmail":"waste.manager@gmx.de","sentAt":"2007-12-15T16:35:03Z","receivedAt":"2007-12-15T16:35:03Z","isPatch":true,"sender":{"key":"waste.manager@gmx.de","avatar":null},"body":"On Fri, Dec 14, 2007 at 08:39:09AM -0800, Eric Wong wrote:\n> Previously, git-svn would ignore cases where the path we're\n> tracking is removed from the repository. This was to prevent\n> heads with follow-parent from ending up with a tree full of\n> empty revisions (and thus breaking rename detection).\n> \n> The previous behavior is fine until the path we're tracking\n> is re-added later on, leading to the old files being merged\n> in with the new files in the directory (because the old\n> files were never marked as deleted)\n> \n> We will now only remove all the old files locally that were\n> deleted remotely iff we detect the directory we're in is being\n> created from scratch.\n> \n> Thanks for Marcus D. Hanwell for the bug report and\n> Peter Baumann for the analysis.\n> \n> Signed-off-by: Eric Wong \n[...]\n\nIt seems to solve the problem seen in the avogadro repo. At least\nthe suspicious revisions I checked looked identical in the imported\nversion.\n\n-Peter\n"}]}