And I didn't expect them to be == ;-) I'm not sure what aliases to
comment/ask for help on so I've probably subjected too many folk, sorry.
I've read most of Mark's flag days more than once as well as some of the
referenced materials. I've not read the Mecurial book in any detail.
I do intend to go back over Mark's flag days and referenced materials.
I've completed my 1st (of hopefully many) pushes to OpenSolaris. Here's
some things that I found different and would like to know where to go
to find solutions.
I started by cloning a fresh repo/workspace from /ws/onnv-clone and
/ws/onnv-clone/usr/closed and eventually pushing to
ssh://onhg at onnv.eng//export/onnv-gate.
1) There seems to be no equivalent to wx/active where
I can define only those files I wish to be active and
putback comments for each file.
I almost always have multiple different things with multiple
different files going on in my TeamWare workspaces. I manage
them multiple wx/active files for webrev and putback from a
single TeamWare workspace.
How do I get the same functionality from Hg+Cd?
2) There seems to be no equivalent to wx pdiffs and
wx pdiffs -c . Formats I get from Hg I find hard to read.
How do I get the equivalent of wx pdiffs [-c]?
3) Every hg command that accesses the parent spits out
"Not trusting file /ws/onnv-clone/.hg/hgrc from untrusted user
nobody, group nobody"
What's wrong and how do I stop that?
4) If I reference the parent via ssh I'm prompted for
my id_dsa passphrase. If I ssh to a SWAN machine
I'm prompted for my id_rsa passphrase.
Why the difference?
How do I stop having to give my id_dsa passphrase for onnv.eng?
5) hg pbchk -p ssh://onhg at onnv.eng//export/onnv-gate
succeeds happily, but the immediately following
hg push -p ssh://onhg at onnv.eng//export/onnv-gate
fails.
Is there some deficiency in pbchk?
6) hg push -p ssh://onhg at onnv.eng//export/onnv-gate
fails complaining about files I'm not modifying.
Why is push deficient in its updates?
Why must I continually iterate pulls, updates, merges, commits,
recommits, pushes until I sneak in before someone else?
What is the correct and approved sequence?
hg pull; hg commit -m "merge gate";
hg recommit -m "my message";hg push
7) I get push notification mail of my changes, but the corresponding
Bugster CRs are not updated. Nor does the mail say to update
them and with what build.
What's the current procedure for updating CRs?
Will things go back to the more automated way that the
gatekeeper notifications were on the tw gates?
8) So far, I've not had a conflict (only been doing Hg for a week),
but merges seem to be required to happen automagically.
I understand this is required for the convenience of the
conflicting push issue I noted in 6). I'm happy to have
all non-conflicting files automatically merged (just like when
I did a bringover). I never what any of my "active" files
to ever be merged by any tool other than my fingers using
$EDITOR.
The way I did this with TeamWare by making a copy of any
files in conflict, running resolve and always accepting parent,
then reediting and merging again. Finally redelget.
How do I affect the same work flow in Hg+Cd?
Or where do I go to see how to do this?
Am I missing that it's already there since I've not need to
merge any conflicts so far?
Thanks for listening. RTMs gladly accepted ;-)
Cheers,
Gary..
