It appears that you need to remove the ident strings from those files.
That's new with the transition to Mercurial.
This is the topic of yet another note that I plan to send either this
evening or tomorrow morning.
--Mark
On Tue, 5 Aug 2008, lipeng sang - Sun Microsystems - Beijing China wrote:
> Date: Tue, 05 Aug 2008 13:19:02 +0800
> From: lipeng sang - Sun Microsystems - Beijing China <Lipeng.Sang at Sun.COM>
> To: Mark J. Nelson <Mark.J.Nelson at Sun.COM>, on-discuss at opensolaris.org
> Subject: Re: heads up: improved support for teamware to mercurial conversion
>
> Hi, Mark
>
> When I converted my teamware workspace to Mercurial workspace with wx2hg, I
> met one problem, which I can't remove the SCCS keyword.
>
> Do you know the reason and could you help to resolve it?
> Thanks in advanced!
>
> The detail information is as below:
>
> -------------------------------------------------------------------------------
> xinxin at ls227211>wx2hg -u -t /export/home/workspaces/hg1/
> usage: wx2hg [-u] [-r hg_rev] [-t hg_ws] codemgr_ws
> xinxin at ls227211>wx2hg -u -t /export/home/workspaces/hg1/
> /export/home/workspaces/work
>
> Doing out check:
> Updating preexisting Mercurial workspace /export/home/workspaces/hg1/ to tip
>
> 6 files updated, 0 files merged, 1 files removed, 0 files unresolved
> patching file usr/src/pkgdefs/SUNWhea/prototype_com
> patching file usr/src/uts/common/io/consconfig_dacf.c
> patching file usr/src/uts/common/io/openprom.c
> patching file usr/src/uts/common/io/tem.c
> patching file usr/src/uts/common/sys/Makefile
> patching file usr/src/uts/common/sys/consconfig_dacf.h
> new file: usr/src/uts/common/sys/consplat.h
> + cd /export/home/workspaces/hg1//usr/src/uts/common/sys
> + hg add consplat.h
> wx2hg: note: remember to commit your changes:
> in primary repository /export/home/workspaces/hg1/:
> M usr/src/pkgdefs/SUNWhea/prototype_com
> M usr/src/uts/common/io/consconfig_dacf.c
> M usr/src/uts/common/io/openprom.c
> M usr/src/uts/common/io/tem.c
> M usr/src/uts/common/sys/Makefile
> M usr/src/uts/common/sys/consconfig_dacf.h
> A usr/src/uts/common/sys/consplat.h
>
> ----------------------------------------------------------------------------------
> xinxin at ls227211>hg pbchk
> Password:
> remote: Not trusting file /export/gate-hg/.hg/hgrc from untrusted user
> daemon, group other
> CDDL block check:
>
> Copyright check:
>
> C style check:
>
> Header format check:
>
> Java style check:
>
> File permission check:
>
> Keywords check:
> usr/src/pkgdefs/SUNWhea/prototype_com: 26: contains SCCS keywords "%Z%, %M%,
> %I%, %E%"
> usr/src/uts/common/io/consconfig_dacf.c: 27: contains SCCS keywords "%Z%,
> %M%, %I%, %E%"
> usr/src/uts/common/io/consconfig_dacf.c: 264: contains SCCS keywords "%I%"
> usr/src/uts/common/io/openprom.c: 25: contains SCCS keywords "%Z%, %M%, %I%,
> %E%"
> usr/src/uts/common/io/openprom.c: 135: contains SCCS keywords "%I%"
> usr/src/uts/common/io/tem.c: 27: contains SCCS keywords "%Z%, %M%, %I%, %E%"
> usr/src/uts/common/sys/Makefile: 25: contains SCCS keywords "%Z%, %M%, %I%,
> %E%"
> usr/src/uts/common/sys/consconfig_dacf.h: 30: contains SCCS keywords "%Z%,
> %M%, %I%, %E%"
> usr/src/uts/common/sys/consplat.h: 30: contains SCCS keywords "%Z%, %M%, %I%,
> %E%"
>
> Comments check:
>
> Checking for new tags:
>
> Checking for multiple heads (or branches):
>
> Checking for branch changes:
>
> RTI check:
>
> Checking for uncommitted changes:
> Warning: the following files have uncommitted changes:
> usr/src/pkgdefs/SUNWhea/prototype_com
> usr/src/uts/common/io/consconfig_dacf.c
> usr/src/uts/common/io/openprom.c
> usr/src/uts/common/io/tem.c
> usr/src/uts/common/sys/Makefile
> usr/src/uts/common/sys/consconfig_dacf.h
> usr/src/uts/common/sys/consplat.h
>
> Checking for merges:
>
> ------------------------------------------------------------------------------
>
> Mark J. Nelson ??:
>>
>> Off-SWAN users: this note will be utterly uninteresting to you, as you
>> don't deal with usr/closed and you don't deal with the on-SWAN, teamware
>> workspaces.
>>
>>
>>
>> Two items to help y'all out with those workspace conversions:
>>
>> 1. With the putback of
>>
>> 6731044 wx2hg should deal better with nested repositories
>>
>> wx2hg now does a much better job dealing with change in the usr/closed
>> repository, and even with changes that move files in/out from
>> usr/closed.
>>
>> 2. The Mercurial clone on elpaso now sports an hg_twin file, making it a
>> suitable parent workspace for use with wx2hg. (Actually it's been
>> there for a while, but the previously mentioned changes were still
>> outstanding...)
>>
>> As an added bonus, you can use this with your local teamware clone: if
>> you keep a regional copy of the teamware clone workspace, you may
>>
>> cp /ws/onnv-clone/Codemgr_wsdata/hg_twin
>> ${YOUR_CLONE}/Codemgr_wsdata
>>
>> ...and you won't need to maintain a local copy of the Mercurial clone.
>>
>> Questions to me or scm-migration-dev at opensolaris.org.
>>
>> --Mark
>
>
