With the changeover to mercurial, I've missed Teamware's resolve
command for resolving merge conflicts. Not the filemerge GUI, but the
terminal-based interface for merging, editing, and diffing the various
versions. So, I created an hg-merge script to emulate resolve's
interface.
I place the scr
*Synopsis*: build products inadvertently integrated for a couple of pkg
copyright files
CR 6753356 changed on Oct 22 2008 by
=== Field === New Value = === Old Value =
Integrated in Buildsnv_101
Status
Basabi Bhattacharya wrote:
> Mark,
>
> Here is what you've asked:
Not completely, but enough to confirm my earlier assertion that you're
using old tools.
> waldorf:/export/basabi: hg-active -w onnv
> Password:
> remote: Not trusting file /export/onnv-clone/.hg/hgrc from untrusted
> user onhg,
Mark,
Here is what you've asked:
waldorf:/export/basabi: hg-active -w onnv
Password:
remote: Not trusting file /export/onnv-clone/.hg/hgrc from untrusted
user onhg, group gk
HG_PARENT=15f1d0c1d28fba4c701bb3129f36527849e95f24
usr/src/lib/fm/libfmd_snmp/Makefile.com
6761986 Update pathname for li
