I have had an intermittent hg recommit error.
The problem has gone away without any intervention
I don't know what can cause it but here is a log.
There seamed to be a mismatch between the Mercurial
and Cadimum view of the changes.
Can you please reply directly to me as I am not in the
scm-migration-dev alias.
Regards
Julian
coptic(5.11-94i)> hg recommit
abort: workspace has uncommitted changes
coptic(5.11-94i)> hg commit
nothing changed
coptic(5.11-94i)> hg recommit
abort: workspace has uncommitted changes
coptic(5.11-94i)> hg list
modified:
usr/src/cmd/idmap/idmapd/adutils.c
usr/src/cmd/idmap/idmapd/dbutils.c
usr/src/cmd/idmap/idmapd/idmap_config.c
usr/src/cmd/idmap/idmapd/idmap_config.h
usr/src/cmd/idmap/idmapd/idmapd.h
usr/src/cmd/idmap/idmapd/init.c
usr/src/cmd/idmap/idmapd/server.c
usr/src/lib/libadutils/common/adutils.c
usr/src/lib/libadutils/common/adutils_impl.h
usr/src/lib/libadutils/common/libadutils.h
usr/src/lib/libadutils/common/mapfile-vers
usr/src/lib/libidmap/common/addisc.c
usr/src/lib/libidmap/common/addisc.h
usr/src/lib/libidmap/common/idmap_api.c
usr/src/lib/libidmap/common/mapfile-vers
usr/src/lib/libidmap/common/namemaps.c
usr/src/lib/nsswitch/ad/common/ad_common.c
usr/src/uts/common/sys/idmap.h
coptic(5.11-94i)> hg pbchk
CDDL block check:
Copyright check:
C style check:
Header format check:
Java style check:
File permission check:
Keywords check:
Comments check:
These comments are neither bug nor ARC case:
changed usr/src/lib/libadutils/common/adutils.c
changed usr/src/lib/libadutils/common/libadutils.h
changed usr/src/lib/nsswitch/ad/common/ad_common.c
Checking for new tags:
Checking for multiple heads (or branches):
Checking for branch changes:
RTI check:
Incorrect gate name specified: ERROR: CLI_BugsterSearch::___map_gate() -
Incorrect gate name
nv-winchester-x86-baban
RETURN_CODE=5
Incorrect gate name specified: ERROR: CLI_BugsterSearch::___map_gate() -
Incorrect gate name
nv-winchester-x86-baban
RETURN_CODE=5
Checking for uncommitted changes:
Warning: the following files have uncommitted changes:
usr/src/pkgdefs/SUNWxvmipar/copyright
usr/src/pkgdefs/SUNWxvmipau/copyright
Checking for merges:
Workspace contains the following merges:
7796:f837dd776c14 changed usr/src/lib/libadutils/common/adutils.c
coptic(5.11-94i)> hg list -v
modified:
usr/src/cmd/idmap/idmapd/adutils.c
usr/src/cmd/idmap/idmapd/dbutils.c
usr/src/cmd/idmap/idmapd/idmap_config.c
usr/src/cmd/idmap/idmapd/idmap_config.h
usr/src/cmd/idmap/idmapd/idmapd.h
usr/src/cmd/idmap/idmapd/init.c
usr/src/cmd/idmap/idmapd/server.c
usr/src/lib/libadutils/common/adutils.c
usr/src/lib/libadutils/common/adutils_impl.h
usr/src/lib/libadutils/common/libadutils.h
usr/src/lib/libadutils/common/mapfile-vers
usr/src/lib/libidmap/common/addisc.c
usr/src/lib/libidmap/common/addisc.h
usr/src/lib/libidmap/common/idmap_api.c
usr/src/lib/libidmap/common/mapfile-vers
usr/src/lib/libidmap/common/namemaps.c
usr/src/lib/nsswitch/ad/common/ad_common.c
usr/src/uts/common/sys/idmap.h
coptic(5.11-94i)> hg outgoing -v
comparing with /share/bld/u/jp151216/nv-winchester-x86-baban
searching for changes
changeset: 7786:512e55f95c51
user: Julian Pullen <Julian.Pullen at Sun.COM>
date: Thu Oct 02 11:16:06 2008 +0100
description:
6569405 support for cross-forest trusts needed
6700691 idmap returns the error "Internal error" if asked to map domain
SIDs when in workgroup mode
modified:
usr/src/cmd/idmap/idmapd/adutils.c
usr/src/cmd/idmap/idmapd/dbutils.c
usr/src/cmd/idmap/idmapd/idmap_config.c
usr/src/cmd/idmap/idmapd/idmap_config.h
usr/src/cmd/idmap/idmapd/idmapd.h
usr/src/cmd/idmap/idmapd/init.c
usr/src/cmd/idmap/idmapd/server.c
usr/src/lib/libadutils/common/adutils.c
usr/src/lib/libadutils/common/adutils_impl.h
usr/src/lib/libadutils/common/libadutils.h
usr/src/lib/libadutils/common/mapfile-vers
usr/src/lib/libidmap/common/addisc.c
usr/src/lib/libidmap/common/addisc.h
usr/src/lib/libidmap/common/idmap_api.c
usr/src/lib/libidmap/common/mapfile-vers
usr/src/lib/libidmap/common/namemaps.c
usr/src/lib/nsswitch/ad/common/ad_common.c
usr/src/uts/common/sys/idmap.h
changeset: 7796:f837dd776c14
tag: tip
parent: 7786:512e55f95c51
parent: 7795:0ab998069bdf
user: Julian Pullen <Julian.Pullen at Sun.COM>
date: Mon Oct 06 10:24:53 2008 +0100
description:
changed usr/src/lib/libadutils/common/adutils.c
changed usr/src/lib/libadutils/common/libadutils.h
changed usr/src/lib/nsswitch/ad/common/ad_common.c
modified:
usr/src/Makefile.lint
usr/src/cmd/mdb/Makefile.kmdb
usr/src/cmd/ztest/ztest.c
usr/src/lib/libadutils/Makefile
usr/src/lib/libadutils/Makefile.com
usr/src/lib/libadutils/common/adutils.c
usr/src/lib/libadutils/common/libadutils.h
usr/src/lib/libc/port/gen/getut.c
usr/src/lib/libpam/pam_framework.c
usr/src/lib/nsswitch/ad/Makefile.com
usr/src/lib/nsswitch/ad/common/ad_common.c
usr/src/lib/nsswitch/ad/common/ad_common.h
usr/src/tools/Makefile.tools
usr/src/tools/SUNWonbld/prototype_com
usr/src/tools/cw/cw.c
usr/src/tools/scripts/Makefile
usr/src/tools/scripts/hgsetup.1
usr/src/tools/scripts/hgsetup.sh
usr/src/uts/common/fs/zfs/vdev_label.c
usr/src/uts/common/io/consconfig_dacf.c
usr/src/uts/common/io/kb8042/kb8042.c
usr/src/uts/common/io/net_dacf.c
usr/src/uts/common/io/pcie.c
usr/src/uts/common/io/ppp/spppcomp/deflate.c
usr/src/uts/common/io/usb/clients/usbser/usbsacm/usbsacm.c
usr/src/uts/common/io/usb/clients/usbser/usbser_keyspan/keyspan_dsd.c
usr/src/uts/common/io/usb/clients/usbser/usbser_keyspan/usbser_keyspan.c
usr/src/uts/common/io/usb/clients/usbser/usbsprl/pl2303_dsd.c
usr/src/uts/common/io/usb/clients/usbser/usbsprl/usbser_pl2303.c
usr/src/uts/common/io/usb/usba/usba.c
usr/src/uts/common/io/usb/usba10/usba10.c
usr/src/uts/i86pc/os/mp_implfuncs.c
usr/src/uts/i86xpv/io/psm/xpv_psm.c
usr/src/uts/i86xpv/io/psm/xpv_uppc.c
usr/src/uts/intel/arcmsr/Makefile
added:
usr/src/tools/scripts/hgstyle
coptic(5.11-94i)> hg status
coptic(5.11-94i)> hg pbchk
CDDL block check:
Copyright check:
C style check:
Header format check:
Java style check:
File permission check:
Keywords check:
Comments check:
These comments are neither bug nor ARC case:
changed usr/src/lib/libadutils/common/adutils.c
changed usr/src/lib/libadutils/common/libadutils.h
changed usr/src/lib/nsswitch/ad/common/ad_common.c
Checking for new tags:
Checking for multiple heads (or branches):
Checking for branch changes:
RTI check:
Incorrect gate name specified: ERROR: CLI_BugsterSearch::___map_gate() -
Incorrect gate name
nv-winchester-x86-baban
RETURN_CODE=5
Incorrect gate name specified: ERROR: CLI_BugsterSearch::___map_gate() -
Incorrect gate name
nv-winchester-x86-baban
RETURN_CODE=5
Checking for uncommitted changes:
Checking for merges:
Workspace contains the following merges:
7796:f837dd776c14 changed usr/src/lib/libadutils/common/adutils.c
coptic(5.11-94i)> hg recommit
saving bundle to
/share/bld/u/jp151216/nv-winchester-x86-merge/.hg/strip-backup/512e55f95c51-temp
coptic(5.11-94i)> hg list
modified:
usr/src/cmd/idmap/idmapd/adutils.c
usr/src/cmd/idmap/idmapd/dbutils.c
usr/src/cmd/idmap/idmapd/idmap_config.c
usr/src/cmd/idmap/idmapd/idmap_config.h
usr/src/cmd/idmap/idmapd/idmapd.h
usr/src/cmd/idmap/idmapd/init.c
usr/src/cmd/idmap/idmapd/server.c
usr/src/lib/libadutils/common/adutils.c
usr/src/lib/libadutils/common/adutils_impl.h
usr/src/lib/libadutils/common/libadutils.h
usr/src/lib/libadutils/common/mapfile-vers
usr/src/lib/libidmap/common/addisc.c
usr/src/lib/libidmap/common/addisc.h
usr/src/lib/libidmap/common/idmap_api.c
usr/src/lib/libidmap/common/mapfile-vers
usr/src/lib/libidmap/common/namemaps.c
usr/src/lib/nsswitch/ad/common/ad_common.c
usr/src/uts/common/sys/idmap.h
coptic(5.11-94i)>
