{"thread":{"id":"27793","subject":"git-p4, RCS keywords","startedAt":"2011-07-12T06:50:36Z","lastAt":"2011-07-12T21:24:04Z","messageCount":2,"participants":["Luke Diamand","Pete Wyckoff"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"171143","messageId":"4E1BEEBC.8060909@diamand.org","threadId":"27793","inReplyTo":null,"subject":"git-p4, RCS keywords","fromName":"Luke Diamand","fromEmail":"luke@diamand.org","sentAt":"2011-07-12T06:50:36Z","receivedAt":"2011-07-12T06:50:36Z","isPatch":false,"sender":{"key":"luke@diamand.org","avatar":"https://avatars.githubusercontent.com/u/5330967?v=4"},"body":"A bit of an ancient topic now, I'm afraid, but back in May I was \nattempting to find a way to get git-p4 to cope with RCS keyword \nexpansion causing merge conflicts.\n\nhttp://marc.info/?l=git&m=130492741320889&w=2\n\nI've given up trying to make this work.\n\nI had thought that I had a scheme that could plausibly work. git-p4 \ndetects when a merge would fail. At this point, look for RCS keywords in \nthe file, and strip them out. For an edit that's easy, for a deletion \nit's a bit trickier.\n\nI then discovered that the third way RCS keywords can cause grief is if \na user copies a file containing expanded RCS keywords into their git \nrepo. My scheme then gave some very weird results!\n\nMaybe this is now the complete list of ways in which RCS keywords can \nmess you up, but I'm not sure. We've got ~9.5k files in our repo with \nRCS keywords. I think it's easier and safer just to go through and turn \noff ktext everywhere. I've actually only seen two or three merge \nconflicts caused by this problem in this time (not sure how many commits \nthat is, but it must be in the hundreds).\n\nI'm not saying it's not possible, just that my approach isn't going to work.\n\nWho invented RCS keyword expansion anyway? They need a good talking to!\n\nLuke\n"},{"id":"171192","messageId":"20110712212404.GA12799@arf.padd.com","threadId":"27793","inReplyTo":"4E1BEEBC.8060909@diamand.org","subject":"Re: git-p4, RCS keywords","fromName":"Pete Wyckoff","fromEmail":"pw@padd.com","sentAt":"2011-07-12T21:24:04Z","receivedAt":"2011-07-12T21:24:04Z","isPatch":false,"sender":{"key":"pw@padd.com","avatar":null},"body":"luke@diamand.org wrote on Tue, 12 Jul 2011 07:50 +0100:\n> A bit of an ancient topic now, I'm afraid, but back in May I was\n> attempting to find a way to get git-p4 to cope with RCS keyword\n> expansion causing merge conflicts.\n> \n> http://marc.info/?l=git&m=130492741320889&w=2\n> \n> I've given up trying to make this work.\n> \n> I had thought that I had a scheme that could plausibly work. git-p4\n> detects when a merge would fail. At this point, look for RCS\n> keywords in the file, and strip them out. For an edit that's easy,\n> for a deletion it's a bit trickier.\n> \n> I then discovered that the third way RCS keywords can cause grief is\n> if a user copies a file containing expanded RCS keywords into their\n> git repo. My scheme then gave some very weird results!\n> \n> Maybe this is now the complete list of ways in which RCS keywords\n> can mess you up, but I'm not sure. We've got ~9.5k files in our repo\n> with RCS keywords. I think it's easier and safer just to go through\n> and turn off ktext everywhere. I've actually only seen two or three\n> merge conflicts caused by this problem in this time (not sure how\n> many commits that is, but it must be in the hundreds).\n> \n> I'm not saying it's not possible, just that my approach isn't going to work.\n> \n> Who invented RCS keyword expansion anyway? They need a good talking to!\n\nYeah!  Thanks for the followup; it was an interesting exercise.\nWe went through the pain of turning off ktext everywhere\npossible.  Watch out because it will keep sneaking back in\ndepending on how people do their integrates.\n\n\t\t-- Pete\n"}]}