Since OpenSolaris have choosen Mercurial for Source Code Management, abandoning TeamWare, I thought I'd write a quick transition guide to help people out.
Note: TeamWare talks about workspaces while Mercurial talks about repositories.
| TeamWare/SCCS command | Mercurial command | Comments |
|---|---|---|
bringover -p /ws/onnv-clone -w ~/ws/onnv . | hg clone /ws/onnv-clone onnv | If you leave out the last argument you get a repository with the same name as the parent repository |
sccs edit file.c | n/a | You don't have to go through this step when using Mercurial, just start editing the file |
sccs prs -e file.c | hg log file.c | Show all changes for file.c |
sccs get -pm file.c | hg annotate -n file.c | Print file.c with the revision of each line |
sccs print | hg status | |
sccs diffs | hg diff | Mercurial shows diffs in unified diff format |
sccs delget file.c | n/a | This step is done when you issue hg commit (see below) |
sccs unedit file.c | hg revert file.c | |
bringover | hg pull && hg update | I.e sync with parent, can be done in one step using hg pull --update |
resolve -w ~/ws/onnv | n/a | Resolving conflicts is done as part of the hg update command |
workspace parent | hg paths | Displays the parent repository |
workspace parent -p /ws/onnv-gate | n/a | If you want to putback to a different parent you specify it when you push the changes, e.g. hg push /ws/onnv-gate |
putback -n . | hg status | |
putback < comments.txt | hg commit -l comments.txt && hg push | It is the hg push that pushes the changes to the parent |
I will try to add more hints for TeamWare users once we have a Mercurial repository of OpenSolaris.
[Technorati Tags: OpenSolaris ]
