From: Pete Wyckoff <pw@padd.com>
To: Luke Diamand <luke@diamand.org>
Cc: git@vger.kernel.org, Eric Scouten <eric@scouten.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCHv4] git-p4: add initial support for RCS keywords
Date: Wed, 22 Feb 2012 07:53:27 -0500 [thread overview]
Message-ID: <20120222125327.GA2292@padd.com> (raw)
In-Reply-To: <1329905741-2092-2-git-send-email-luke@diamand.org>
luke@diamand.org wrote on Wed, 22 Feb 2012 10:15 +0000:
> 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
next prev parent reply other threads:[~2012-02-22 12:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-22 10:15 [PATCHv4] git-p4: RCS keyword handling Luke Diamand
2012-02-22 10:15 ` [PATCHv4] git-p4: add initial support for RCS keywords Luke Diamand
2012-02-22 12:53 ` Pete Wyckoff [this message]
2012-02-22 19:29 ` Junio C Hamano
2012-02-22 22:44 ` Luke Diamand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120222125327.GA2292@padd.com \
--to=pw@padd.com \
--cc=eric@scouten.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=luke@diamand.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.