{"thread":{"id":"26013","subject":"git-cvsimport with cvsps output in commit msg breaks imports","startedAt":"2010-12-09T22:03:49Z","lastAt":"2010-12-10T19:58:27Z","messageCount":3,"participants":["Thomas Adam","Michael J Gruber","Andreas Schwab"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"157758","messageId":"20101209220347.GA3180@shuttle.home","threadId":"26013","inReplyTo":null,"subject":"git-cvsimport with cvsps output in commit msg breaks imports","fromName":"Thomas Adam","fromEmail":"thomas@xteddy.org","sentAt":"2010-12-09T22:03:49Z","receivedAt":"2010-12-09T22:03:49Z","isPatch":false,"sender":{"key":"thomas@xteddy.org","avatar":"https://gravatar.com/avatar/e7256db4738e501e5d2e84f00bb0bd99503165729573848a03330301fc2adc4a?d=mp&s=160"},"body":"Hi all,\n\n[ I've Cced both the cvsps maintainer and the author listed for\ngit-cvsimport in case it's more relevant to either tool. ]\n\nI am wondering if anyone here is able to shed some light on a problem I've\nencountered with git-cvsimport.  For ages now, I've had an automatic\nconversion of a CVS repository to a Git one, using git-cvsimport to update a\nrepository as commits happen in CVS.\n\nThe repository in question is here:\n\nhttps://github.com/ThomasAdam/tmux\n\nEverything is on the Master branch.\n\nMore specifically, the commit which I think introduced the problem, and all\nsubsequent commits thereafter is here:\n\nhttps://github.com/ThomasAdam/tmux/commit/f0220a10b01a764e0dc52ea1b2407f58600a30eb\n\nNote that from this commit onwards, the commit *message* has a bunch of\ncvsps output in it.  I can only surmise that this somehow causes problems\nfor cvsimport.\n\nBut I can't say for sure.\n\nBut if you look at the commit after f0220a10b0:\n\nhttps://github.com/ThomasAdam/tmux/commit/a7e5b474af93e36e314170e2db18e544e34cf7b3\n\nThe file cvsimport has imported has actually *reverted* the file in\nquestion.  Confer:\n\n-/* $Id: tmux.h,v 1.582 2010/12/06 21:48:56 nicm Exp $ */\n+/* $Id: tmux.h,v 1.246 2009/01/21 19:38:51 nicm Exp $ */\n\nIs anyone able to shed some light on this?  Needless to say I am a little\nperplexed that content in the commit message (if that's what it is) would\ncause a cvsimport to fail.\n\nThe net result of this is I can no longer compile the master branch at all\nbecause of this.  Oh, and should anyone be thinking it, compiling the CVS\nrepository which the git-cvsimport command is referencing, compiles fine.\nSo it's definitely a problem with the import.\n\nAny questions or further bits of information I can provide, do shout.\n\nTIA.\n\n-- Thomas Adam\n\n-- \n\"Deep in my heart I wish I was wrong.  But deep in my heart I know I am\nnot.\" -- Morrissey (\"Girl Least Likely To\" -- off of Viva Hate.)\n"},{"id":"157815","messageId":"4D0221A3.6080706@drmicha.warpmail.net","threadId":"26013","inReplyTo":"20101209220347.GA3180@shuttle.home","subject":"Re: git-cvsimport with cvsps output in commit msg breaks imports","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-12-10T12:48:35Z","receivedAt":"2010-12-10T12:48:35Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Thomas Adam venit, vidit, dixit 09.12.2010 23:03:\n> Hi all,\n> \n> [ I've Cced both the cvsps maintainer and the author listed for\n> git-cvsimport in case it's more relevant to either tool. ]\n> \n> I am wondering if anyone here is able to shed some light on a problem I've\n> encountered with git-cvsimport.  For ages now, I've had an automatic\n> conversion of a CVS repository to a Git one, using git-cvsimport to update a\n> repository as commits happen in CVS.\n> \n> The repository in question is here:\n> \n> https://github.com/ThomasAdam/tmux\n> \n> Everything is on the Master branch.\n> \n> More specifically, the commit which I think introduced the problem, and all\n> subsequent commits thereafter is here:\n> \n> https://github.com/ThomasAdam/tmux/commit/f0220a10b01a764e0dc52ea1b2407f58600a30eb\n> \n> Note that from this commit onwards, the commit *message* has a bunch of\n> cvsps output in it.  I can only surmise that this somehow causes problems\n> for cvsimport.\n> \n> But I can't say for sure.\n\nThe previous one has cvsps info in the commit message already, prefixed\nwith \"|\". So the problem is the previous one or the one before.\n\nIf you have cvs checkout, can spot anything between those? Can you redo\nthe cvsps import from that point on and check cvsps log?\n\nMichael\n"},{"id":"157844","messageId":"m2ei9p8knw.fsf@igel.home","threadId":"26013","inReplyTo":"20101209220347.GA3180@shuttle.home","subject":"Re: git-cvsimport with cvsps output in commit msg breaks imports","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2010-12-10T19:58:27Z","receivedAt":"2010-12-10T19:58:27Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Thomas Adam <thomas@xteddy.org> writes:\n\n> More specifically, the commit which I think introduced the problem, and all\n> subsequent commits thereafter is here:\n>\n> https://github.com/ThomasAdam/tmux/commit/f0220a10b01a764e0dc52ea1b2407f58600a30eb\n>\n> Note that from this commit onwards, the commit *message* has a bunch of\n> cvsps output in it.  I can only surmise that this somehow causes problems\n> for cvsimport.\n\nThe cvsps output is ambigous.  If the commit log includes text that\nresembles the patchset format generated by cvsps then git-cvsimport can\neasily get confused.\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"}]}