git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCHv4] git-p4: add initial support for RCS keywords

From
PWPete Wyckoff <pw@padd.com>
Date
Feb 22, 2012, 12:53 UTC
Message-ID
<20120222125327.GA2292@padd.com>
In-Reply-To
<1329905741-2092-2-git-send-email-luke@diamand.org>
luke@diamand.org wrote on Wed, 22 Feb 2012 10:15 +0000:
Show 16 quoted lines
> RCS keywords cause problems for git-p4 as perforce always
> expands them (if +k is set) and so when applying the patch,
> git reports that the files have been modified by both sides,
> when in fact they haven't.
> 
> This change means that when git-p4 detects a problem applying
> a patch, it will check to see if keyword expansion could be
> the culprit. If it is, it strips the keywords in the p4
> repository so that they match what git is expecting. It then
> has another go at applying the patch.
> 
> This behaviour is enabled with a new git-p4 configuration
> option and is off by default.
> 
> Improved-by: Pete Wyckoff <pw@padd.com>
> Signed-off-by: Luke Diamand <luke@diamand.org>

Looks brilliant. Ack. Thanks for suffering through N rounds of review. :)

		-- Pete
Previous: Luke DiamandNext: Junio C Hamano
Message 3 of 5 in “[PATCHv4] git-p4: RCS keyword handling”
  1. Luke DiamandFeb 22, 2012
  2. [PATCHv4] git-p4: add initial support for RCS keywordsLuke Diamand, Feb 22, 2012
  3. Pete WyckoffFeb 22, 2012
  4. Junio C HamanoFeb 22, 2012
  5. Luke DiamandFeb 22, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.