On Wed, Mar 30, 2011 at 08:35:55AM +1000, James C. McPherson wrote: > On 30/03/11 08:27 AM, Will Fiveash wrote: > >I've been using the onnv-gk-tools tools for a while when I setup a > >project gate for an internal Solaris project. Recently I was forced to > >update my system to snv_161 and rebase the project gate to snv_162. At > >this point several things are not working. > > > >Here's my situation: I've done hg merge in a rebase repo (it's a copy of > >onnv-clone and I pulled the changsets from the project gate into it). > >When I try to push from the rebase repo to the project repo I see: > ... > >remote: *** ERROR: Merge turd > >remote: error: pretxnchangegroup.1 hook raised an exception: 'getgrnam(): > >name not found: gk' > ... > > Hi Will, > it looks to me like you need to pull in the changeset I > asked for review of on 18 March: > > http://mail.opensolaris.org/pipermail/scm-migration-dev/2011-March/003686.html > > > You can find the webrev and patch at > http://cr.opensolaris.org/~jmcp/gktools-26_update/
I applied the patch but when I push I'm now seeing: $ hg push mitresync-gate pushing to ssh://mi...@alton.us.oracle.com//export/gates/mit-1.8-resync-gate searching for changes Are you sure you wish to push? [y/N]: y remote: adding changesets remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files remote: caching changes for gatehooks... remote: ...changes cached remote: Sanity checking your push... remote: ...Sanity checks passed remote: remote: remote: DO NOT HIT CONTROL C remote: remote: remote: 1 files updated, 0 files merged, 0 files removed, 0 files unresolved remote: pushing to /export/gates/mit-1.8-resync-clone remote: searching for changes remote: source = "push" remote: url = "file:/export/gates/mit-1.8-resync-gate" remote: adding changesets remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files remote: Exception TypeError: TypeError("'NoneType' object is not callable",) in <bound method Popen.__del__ of <subprocess.Popen object at 0xb7b11cc>> ignored remote: 1 files updated, 0 files merged, 0 files removed, 0 files unresolved remote: Preparing notification email... remote: ...notification sent Any thoughts on the Exception TypeError: above? As an aside, I recently rebased our project gate repo to a more current version of ON. To do this I followed the best practices for project gates in: http://hub.opensolaris.org/bin/view/Community+Group+tools/hg_workflow The methodology outlined there creates a merge changeset with 2 parents which is pushed to the project gate repo. The problem I've encountered is that using the hgrc hook in the project gate: pretxnchangegroup.1 = python:hook.sanity.sanity prevents this merge changeset from being pushed. Can I disable the multiple parent check on changesets? -- Will Fiveash Oracle http://opensolaris.org/os/project/kerberos/ Sent using mutt, a sweet, text based e-mail app <http://www.mutt.org/> _______________________________________________ tools-discuss mailing list tools-discuss@opensolaris.org