{"thread":{"id":"19485","subject":"hg2git error","startedAt":"2009-05-24T17:33:40Z","lastAt":"2009-07-22T18:05:24Z","messageCount":10,"participants":["Johannes Schindelin","Sverre Rabbelier","Rocco Rutte","Matthieu Moy"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"114579","messageId":"alpine.DEB.1.00.0905241932301.26154@pacific.mpi-cbg.de","threadId":"19485","inReplyTo":null,"subject":"hg2git error","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-05-24T17:33:40Z","receivedAt":"2009-05-24T17:33:40Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nI get this error:\n\nError: repository has at least one unnamed head: hg r533\n\nHow to cope with that?\n\nCiao,\nDscho\n"},{"id":"114581","messageId":"fabb9a1e0905241038x7ea22622k930f50b9c7598c6e@mail.gmail.com","threadId":"19485","inReplyTo":"alpine.DEB.1.00.0905241932301.26154@pacific.mpi-cbg.de","subject":"Re: hg2git error","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-05-24T17:38:18Z","receivedAt":"2009-05-24T17:38:18Z","isPatch":false,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Sun, May 24, 2009 at 19:33, Johannes Schindelin\n wrote:\n> How to cope with that?\n\nI've been working on making hg-git [0] usable as a two-way bridge\n(that is, use it to interact with a hg repository using git). It is\ncoping just fine with unnamed heads so far :).\n\n\n\n[0] http://hg-git.github.com/\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"114584","messageId":"alpine.DEB.1.00.0905242013080.26154@pacific.mpi-cbg.de","threadId":"19485","inReplyTo":"fabb9a1e0905241038x7ea22622k930f50b9c7598c6e@mail.gmail.com","subject":"Re: hg2git error","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-05-24T18:16:02Z","receivedAt":"2009-05-24T18:16:02Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 24 May 2009, Sverre Rabbelier wrote:\n\n> On Sun, May 24, 2009 at 19:33, Johannes Schindelin\n> wrote:\n> > How to cope with that?\n> \n> I've been working on making hg-git [0] usable as a two-way bridge\n> (that is, use it to interact with a hg repository using git). It is\n> coping just fine with unnamed heads so far :).\n> \n> \n\nIt says \"Achtung! Alpha!\". How alpha is it?\n\nAlso, there is the issue that it is a Hg extension. My experience with \nsuch extensions and their dependency on certain Hg versions make me ask: \nwhat version of Hg must I install before I can use Hg-git?\n\nCiao,\nDscho\n"},{"id":"114586","messageId":"fabb9a1e0905241120v65adf9f9u7b8d212e99d7f6cd@mail.gmail.com","threadId":"19485","inReplyTo":"alpine.DEB.1.00.0905242013080.26154@pacific.mpi-cbg.de","subject":"Re: hg2git error","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-05-24T18:20:04Z","receivedAt":"2009-05-24T18:20:04Z","isPatch":false,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Sun, May 24, 2009 at 20:16, Johannes Schindelin\n wrote:\n> It says \"Achtung! Alpha!\".  How alpha is it?\n\nI'm using it to work on Melange, the problems I've had with it so far\nhave all been fixed :).\n\n> Also, there is the issue that it is a Hg extension.  My experience with\n> such extensions and their dependency on certain Hg versions make me ask:\n> what version of Hg must I install before I can use Hg-git?\n\nRight, you will need to have hg installed to bridge between git and\nhg, I think the current requirements are 'python 2.5' and 'hg 1.2' but\nthat's mostly because that's what we're testing, not because we depend\non specific features.\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"114659","messageId":"20090525113418.GA3259@robert","threadId":"19485","inReplyTo":"alpine.DEB.1.00.0905241932301.26154@pacific.mpi-cbg.de","subject":"Re: hg2git error","fromName":"Rocco Rutte","fromEmail":"pdmef@gmx.net","sentAt":"2009-05-25T11:34:18Z","receivedAt":"2009-05-25T11:34:18Z","isPatch":false,"sender":{"key":"pdmef@gmx.net","avatar":null},"body":"Hi,\n\n* Johannes Schindelin wrote:\n\n> Error: repository has at least one unnamed head: hg r533\n\nI'm afraid there's nothing you can do except a) wait until somebody with\npush access to the repo merges or b) do that yourself. The error means\nthat on a branch there's more than one head (i.e. childless\nrevision). There's no equivalent concept in git which is why I don't\nknow what to do. Generating fake branch names for git may be a little\nmessy I think.\n\nRocco\n"},{"id":"114660","messageId":"alpine.DEB.1.00.0905251341370.4288@intel-tinevez-2-302","threadId":"19485","inReplyTo":"20090525113418.GA3259@robert","subject":"Re: hg2git error","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-05-25T11:43:15Z","receivedAt":"2009-05-25T11:43:15Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 25 May 2009, Rocco Rutte wrote:\n\n> * Johannes Schindelin wrote:\n> \n> > Error: repository has at least one unnamed head: hg r533\n> \n> I'm afraid there's nothing you can do except a) wait until somebody with\n> push access to the repo merges or b) do that yourself. The error means\n> that on a branch there's more than one head (i.e. childless\n> revision). There's no equivalent concept in git which is why I don't\n> know what to do. Generating fake branch names for git may be a little\n> messy I think.\n\nI disagree... The worst solution is to stop working at all. A better \nsolution would be to ignore the unnamed head, and the best solution would \nprobably be to generate ref names that are _not_ branch names for such \nheads.\n\nCiao,\nDscho\n"},{"id":"114662","messageId":"vpqprdxpf8g.fsf@bauges.imag.fr","threadId":"19485","inReplyTo":"alpine.DEB.1.00.0905251341370.4288@intel-tinevez-2-302","subject":"Re: hg2git error","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@imag.fr","sentAt":"2009-05-25T11:57:19Z","receivedAt":"2009-05-25T11:57:19Z","isPatch":false,"sender":{"key":"git@matthieu-moy.fr","avatar":"https://avatars.githubusercontent.com/u/14709?v=4"},"body":"Johannes Schindelin writes:\n\n> I disagree... The worst solution is to stop working at all. A better \n> solution would be to ignore the unnamed head,\n\n... or to import the commits of this unnamed head, without setting a\nGit reference to it (with a message on the console saying stg like\n\"Unnamed head imported as commit %s\\n\" to let the user do something\nwith the sha1).\n\n> and the best solution would probably be to generate ref names that\n> are _not_ branch names for such heads.\n\nStg like refs/hg-heads// ? (seems to be accepted in\nthe Git namespace)\n\n(my 2 cents)\n\n-- \nMatthieu\n"},{"id":"114671","messageId":"20090525132242.GB3259@robert","threadId":"19485","inReplyTo":"alpine.DEB.1.00.0905251341370.4288@intel-tinevez-2-302","subject":"Re: hg2git error","fromName":"Rocco Rutte","fromEmail":"pdmef@gmx.net","sentAt":"2009-05-25T13:22:42Z","receivedAt":"2009-05-25T13:22:42Z","isPatch":false,"sender":{"key":"pdmef@gmx.net","avatar":null},"body":"Hi,\n\n* Johannes Schindelin wrote:\n> On Mon, 25 May 2009, Rocco Rutte wrote:\n> > * Johannes Schindelin wrote:\n\n> > > Error: repository has at least one unnamed head: hg r533\n\n> > I'm afraid there's nothing you can do except a) wait until somebody with\n> > push access to the repo merges or b) do that yourself. The error means\n> > that on a branch there's more than one head (i.e. childless\n> > revision). There's no equivalent concept in git which is why I don't\n> > know what to do. Generating fake branch names for git may be a little\n> > messy I think.\n\n> I disagree... The worst solution is to stop working at all. A better \n> solution would be to ignore the unnamed head, and the best solution would \n> probably be to generate ref names that are _not_ branch names for such \n> heads.\n\nBoth solutions require refactoring and new code that is abled to walk\nthe DAG mercurial gives us since in both cases we'd need to find the\nfork point. I don't know mercurials good enough to say if and how much\nits API can help here.\n\nI don't use git any longer and do only fix obvious breakages for\nhg-fast-export, read: since this is a new feature I'm afraid I won't\nimplement it.\n\nRocco\n"},{"id":"118469","messageId":"alpine.DEB.1.00.0907221946590.7343@intel-tinevez-2-302","threadId":"19485","inReplyTo":"fabb9a1e0905241120v65adf9f9u7b8d212e99d7f6cd@mail.gmail.com","subject":"Re: hg2git error","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-07-22T17:47:25Z","receivedAt":"2009-07-22T17:47:25Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 24 May 2009, Sverre Rabbelier wrote:\n\n> On Sun, May 24, 2009 at 20:16, Johannes Schindelin \n> wrote:\n> > It says \"Achtung! Alpha!\".  How alpha is it?\n> \n> I'm using it to work on Melange, the problems I've had with it so far \n> have all been fixed :).\n> \n> > Also, there is the issue that it is a Hg extension.  My experience \n> > with such extensions and their dependency on certain Hg versions make \n> > me ask: what version of Hg must I install before I can use Hg-git?\n> \n> Right, you will need to have hg installed to bridge between git and hg, \n> I think the current requirements are 'python 2.5' and 'hg 1.2' but \n> that's mostly because that's what we're testing, not because we depend \n> on specific features.\n\nCould you give me a quick run-through how to install it and use it to \nmirror, say, the netbeans repository?\n\nThanks,\nDscho\n"},{"id":"118473","messageId":"fabb9a1e0907221105n319391es3c928b1bcab4e86a@mail.gmail.com","threadId":"19485","inReplyTo":"alpine.DEB.1.00.0907221946590.7343@intel-tinevez-2-302","subject":"Re: hg2git error","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-07-22T18:05:24Z","receivedAt":"2009-07-22T18:05:24Z","isPatch":false,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Wed, Jul 22, 2009 at 17:47, Johannes\nSchindelin wrote:\n> Could you give me a quick run-through how to install it and use it to\n> mirror, say, the netbeans repository?\n\nSure, feel free to ping me on IRC if you have any questions, I'll\nexplain my workflow for Melange, I reckon you can adapt it to suit\nyour needs.\n\n1. clone hg-git\n```\nmkdir ~/code\ngit clone git://github.com/schacon/hg-git.git ~/code\n```\n2. edit your .hgrc to include the following to turn on the hg-git\nplugin, and the bookmarks plugin which hg-git likes to use to store\nbranches from your git repository:\n```\n[extensions]\nhgext.bookmarks =\ngit = ~/code/hg-git\n```\n3. hg clone the repository of your choice, I'll pretend it's ~/code/Melange\n4. add the following to ~/code/Melange/.hg/hgrc:\n```\n[git]\nintree=1\n```\n5. if possible, add '.git' to .hgignore, if not possible you'll just\nhave to live with it showing up in 'hg status'\n6. run `hg gexport`, this will create a ~/code/Melange/.git which is a\nregular git repository\n7. add .hg to ~/code/Melange/.git/info/exclude\n8. now each time you want to pull in new hg updates, run 'hg pull && hg gexport'\n9. Depending on your preferences, you might want to add the following\nto your ~/code/Melange/.hg/hgrc below intree=1:\n```\nexportbranch=refs/heads/from-hg\n```\n\nDoing so will cause `hg gexport` to override the 'from-hg' branch\ninstead of 'refs/heads/master', allowing you to work in the git\nrepository without worrying about losing any changes when you run `hg\ngexport`.\n10. Push from the git repository as usual:\n```\ngit remote add origin ssh://srabbelier@repo.or.cz/srv/git/Melange.git\ngit push origin master\n```\n\nIf you have any questions, feel free to ask :).\n\n-- \nCheers,\n\nSverre Rabbelier\n"}]}