Linda> Would you kindly take a look at the "General Mercurial" doc and let me Linda> know your thoughts. We think it's near completion and would like any Linda> feedback from the team. Linda> Linda> http://www.opensolaris.org/os/community/tools/scm/hg_help/
Hi Linda, here are my comments on that page: > NOTE: Mercurial is available in Solaris Express releases, starting with Build > 46. Let's say build 88, which is when Mercurial 1.0 was integrated. > Or you can download the SUNWmercurial package from the SCM downloads page, > and follow the instructions to install them. > x86: > > # /usr/sfw/bin/wget > http://www.opensolaris.org/os/community/tools/scmdownloads/SUNWmercurial-<date>.i386.pkg > # /usr/sbin/pkgadd -d SUNWmercurial-<date>.i386.pkg > > > SPARC: > > # /usr/sfw/bin/wget > http://www.opensolaris.org/os/community/tools/scmdownloads/SUNWmercurial-<date>.sparc.pkg > # /usr/sbin/pkgadd -d SUNWmercurial-<date>.sparc.pkg I'm wondering if we should delete this section and just tell people to get Mercurial via Solaris Express. If we keep the reference to the SCM downloads page, then we should clean up that page (e.g., remove old packages). > How to get commit access to opensolaris.org Mercurial repositories This section should mostly be replaced by a link to http://opensolaris.org/os/project/website/ssh_instructions/, so that we have all the SSH instructions in one place. The SVN help page[1] does it this way; you can steal the text from that page. > Information for engineers transitioning from TeamWare is available on > [Martin Englund's blog]. Rather than pointing at Martin's blog here, link to http://www.opensolaris.org/os/community/tools/scm/hg_teamware_transition/. > Updating a child repository [...] > Using hg bundles of the ON repository There should be a section in the middle here on handling merges and conflicts. > OpenSolaris mercurial repositories are typically provided as "bundles" > with a .hg extension. Change "typically" to "sometimes". Otherwise, people are going to be looking on os.o for files ending in .hg, not finding much, and getting confused. > Putting back the changes to the parent repository [...] > hg push /ws/onnv-gate > hg push ssh://anon at hg dot opensolaris dot org/hg/onnv/onnv-gate We should pick one or the other. Listing both will just confuse people. If we pick the external (opensolaris.org) flavor, the line needs a couple changes. First, modify the line so that it doesn't get munged by the email address mangler[2]. Second, the "anon" user cannot push to any repo. Change it to "my_login" and put it in italics? > hg push http://hg.genunix.org/on.hg I don't think this should be listed. Who would push to it? (And it doesn't seem to exist.) > This command is the equivalent of the "workspace parent -p > /ws/onnv-gate" and "putback" TeamWare commands. This is potentially misleading. Instead, say This command is the equivalent of the TeamWare command "putback -p /ws/onnv-gate". > hg outgoing ssh://anon at hg dot opensolaris dot org/hg/onnv/onnv-gate See comment above about the email address mangler. > For Project Leads: How to set up a Mercurial repository [...] > "user" is the opensolaris.org username of an engineer who has commit > rights to the repository. I would change that to "user" is "anon" or the opensolaris.org username of someone who has commit rights to the repository. mike -- Footnotes: [1] http://www.opensolaris.org/os/community/tools/scm/svn_help/ [2] http://blogs.sun.com/kupfer/entry/defeating_the_opensolaris_address_mangler
