Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 28616 - Ignoring RCS keywords in CVS merge
Summary: Ignoring RCS keywords in CVS merge
Status: RESOLVED DUPLICATE of bug 36436
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Team (show other bugs)
Version: 2.1   Edit
Hardware: PC Windows XP
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Michael Valenta CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-12-18 10:03 EST by Michael Valenta CLA
Modified: 2003-04-14 13:06 EDT (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Valenta CLA 2002-12-18 10:03:24 EST 
From the newsgroup:

-------- Original Message --------
Subject: Ignoring RCS keywords in CVS merge
Date: Thu, 7 Nov 2002 16:34:38 -0800
From: "Manish Khettry" <manish.khettry@bdnacorp.com>
Organization: EclipseCorner
Newsgroups: eclipse.tools

We use RCS keywords (auther, version, date etc) in our files. Is there
anyway to tell the eclipse/cvs client to ignore these keywords when
synchronizing.

I've been working on a few dozen files in a branch and when I try to check
in my changes every file that I've changed becomes a conflict because the
version # line has changed. With CVS diff, I can pass regular expressions
to
ignore to the underlying diff tool but I would hope that since eclipse has
its own cvs client, and rcs keywords are such a common thing that eclipse
would be smart enough to ignore these.

Thanks,
Manish
Comment 1 Michael Valenta CLA 2003-04-14 13:06:48 EDT 

*** This bug has been marked as a duplicate of 36436 ***