diff options
| author | Luke Diamand <luke@diamand.org> | 2012-02-23 07:51:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-23 21:25:35 (GMT) |
| commit | 60df071c6cce6ee3f92f62042da11c62fe113817 (patch) | |
| tree | c68c7515aad766bf7108850401dfba5d0ae6bbbb /Documentation/git-p4.txt | |
| parent | 12766861cdf10fbbfda1023fd65aaf864eb8136a (diff) | |
| download | git-60df071c6cce6ee3f92f62042da11c62fe113817.zip git-60df071c6cce6ee3f92f62042da11c62fe113817.tar.gz git-60df071c6cce6ee3f92f62042da11c62fe113817.tar.bz2 | |
git-p4: add initial support for RCS keywords
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.
Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-p4.txt')
| -rw-r--r-- | Documentation/git-p4.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 8b92cc0..3fecefa 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -483,6 +483,11 @@ git-p4.skipUserNameCheck:: user map, 'git p4' exits. This option can be used to force submission regardless. +git-p4.attemptRCSCleanup: + If enabled, 'git p4 submit' will attempt to cleanup RCS keywords + ($Header$, etc). These would otherwise cause merge conflicts and prevent + the submit going ahead. This option should be considered experimental at + present. IMPLEMENTATION DETAILS ---------------------- |