From: Luke Diamand <luke@diamand.org>
To: Pete Wyckoff <pw@padd.com>
Cc: git <git@vger.kernel.org>, Michael Horowitz <michael.horowitz@ieee.org>
Subject: git-p4, RCS keywords
Date: Tue, 12 Jul 2011 07:50:36 +0100 [thread overview]
Message-ID: <4E1BEEBC.8060909@diamand.org> (raw)
A bit of an ancient topic now, I'm afraid, but back in May I was
attempting to find a way to get git-p4 to cope with RCS keyword
expansion causing merge conflicts.
http://marc.info/?l=git&m=130492741320889&w=2
I've given up trying to make this work.
I had thought that I had a scheme that could plausibly work. git-p4
detects when a merge would fail. At this point, look for RCS keywords in
the file, and strip them out. For an edit that's easy, for a deletion
it's a bit trickier.
I then discovered that the third way RCS keywords can cause grief is if
a user copies a file containing expanded RCS keywords into their git
repo. My scheme then gave some very weird results!
Maybe this is now the complete list of ways in which RCS keywords can
mess you up, but I'm not sure. We've got ~9.5k files in our repo with
RCS keywords. I think it's easier and safer just to go through and turn
off ktext everywhere. I've actually only seen two or three merge
conflicts caused by this problem in this time (not sure how many commits
that is, but it must be in the hundreds).
I'm not saying it's not possible, just that my approach isn't going to work.
Who invented RCS keyword expansion anyway? They need a good talking to!
Luke
next reply other threads:[~2011-07-12 6:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-12 6:50 Luke Diamand [this message]
2011-07-12 21:24 ` git-p4, RCS keywords Pete Wyckoff
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E1BEEBC.8060909@diamand.org \
--to=luke@diamand.org \
--cc=git@vger.kernel.org \
--cc=michael.horowitz@ieee.org \
--cc=pw@padd.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).