Gary> 1) There seems to be no equivalent to wx/active where I can define only Gary> those files I wish to be active and putback comments for each file.
Gary> I almost always have multiple different things with multiple different Gary> files going on in my TeamWare workspaces. I manage them multiple Gary> wx/active files for webrev and putback from a single TeamWare workspace. Gary> How do I get the same functionality from Hg+Cd? You don't, at least for now. Use multiple workspaces and keep your work separate. Gary> 2) There seems to be no equivalent to wx pdiffs and wx pdiffs -c . Gary> Formats I get from Hg I find hard to read. Gary> How do I get the equivalent of wx pdiffs [-c]? You don't. Unified diffs have long been the canonical format; get used to it. Gary> 3) Every hg command that accesses the parent spits out "Not trusting Gary> file /ws/onnv-clone/.hg/hgrc from untrusted user nobody, group nobody" Gary> What's wrong and how do I stop that? Nothing is wrong with it; you can add this: [trusted] groups=gk to your ~/.hgrc file. Gary> 4) If I reference the parent via ssh I'm prompted for my id_dsa Gary> passphrase. If I ssh to a SWAN machine I'm prompted for my id_rsa Gary> passphrase. Gary> Why the difference? Don't know; someone else (Dave? Mark?) might. Gary> How do I stop having to give my id_dsa passphrase for onnv.eng? My only suggestion is to generate a key with no pass-phrase, but others might have better ideas. Gary> 5) hg pbchk -p ssh://onhg at onnv.eng//export/onnv-gate Gary> succeeds happily, but the immediately following hg push -p Gary> ssh://onhg at onnv.eng//export/onnv-gate fails. Gary> Is there some deficiency in pbchk? No, that's not part of what it's checking. Gary> 6) hg push -p ssh://onhg at onnv.eng//export/onnv-gate fails complaining Gary> about files I'm not modifying. Gary> Why is push deficient in its updates? It isn't; that's by design AFAIK. Gary> Why must I continually iterate Gary> pulls, updates, merges, commits, recommits, pushes until I sneak in Gary> before someone else? That is the Hg design model AFAIK. Gary> What is the correct and approved sequence? hg Gary> pull; hg commit -m "merge gate"; hg recommit -m "my message";hg push Yes, I think. Mark sent out a heads-up on this. Gary> 7) I get push notification mail of my changes, but the corresponding Gary> Bugster CRs are not updated. Nor does the mail say to update them and Gary> with what build. Gary> What's the current procedure for updating CRs? Will things go back to Gary> the more automated way that the gatekeeper notifications were on the tw Gary> gates? This is on the gk list of things to do. We will get to it eventually but if you want things updated sooner, please do so yourself. Note that any gateling may update to '8-Fix Available' but '10-Fix Integrated' is reserved for us when we integrate our packages to the WOS. Gary> 8) So far, I've not had a conflict (only been doing Hg for a week), but Gary> merges seem to be required to happen automagically. I understand this Gary> is required for the convenience of the conflicting push issue I noted in Gary> 6). I'm happy to have all non-conflicting files automatically merged Gary> (just like when I did a bringover). I never what any of my "active" Gary> files to ever be merged by any tool other than my fingers using $EDITOR. Gary> The way I did this with TeamWare by making a copy of any files in Gary> conflict, running resolve and always accepting parent, then reediting Gary> and merging again. Finally redelget. Gary> How do I affect the same work flow in Hg+Cd? I don't know if you can. Gary> Or where do I go to see how to do this? Again, don't know. Gary> Am I missing that it's already Gary> there since I've not need to merge any conflicts so far? That would be my guess. -- John http://blogs.sun.com/jbeck
