# HG changeset patch # User Arne Babenhauserheide # Date 1242254484 -7200 # Node ID af506d1a935d2ff6b4ca085d6def57c3bba43010 # Parent 6358437dccf251393cb807371b4719121ecf4891 workflow_guide: added some missing

tags. diff -r 6358437dccf2 -r af506d1a935d hgscm/templates/workflow_guide.html --- a/hgscm/templates/workflow_guide.html Thu May 14 00:37:30 2009 +0200 +++ b/hgscm/templates/workflow_guide.html Thu May 14 00:41:24 2009 +0200 @@ -81,7 +81,7 @@ -commit the changes. +

commit the changes.

$ hg commit
 
@@ -116,9 +116,9 @@
 
 
-This prints a list of changesets along with their date, the user who committed them (you) and their commit message. +

This prints a list of changesets along with their date, the user who committed them (you) and their commit message.

-To see a certain revision, you can use the -r switch (--revision). To also see the diff of the displayed revisions, there's the -p switch (--patch) +

To see a certain revision, you can use the -r switch (--revision). To also see the diff of the displayed revisions, there's the -p switch (--patch)

$ hg log -p -r 3
 
@@ -301,29 +301,29 @@
 
 
Rollback mistakes
-Now you can work on different features in parallel, but from time to time a bad commit might sneak in. Naturally you could then just go back one revision and merge the stray error, keeping all mistakes out of the merged revision. However, there's an easier way, if you realize your error before you do another commit or pull: rollback. +

Now you can work on different features in parallel, but from time to time a bad commit might sneak in. Naturally you could then just go back one revision and merge the stray error, keeping all mistakes out of the merged revision. However, there's an easier way, if you realize your error before you do another commit or pull: rollback.

-Rolling back means undoing the last operation which added something to your history. +

Rolling back means undoing the last operation which added something to your history.

-Imagine you just realized that you did a bad commit - for example you didn't see a spelling error in a label. To fix it you would use +

Imagine you just realized that you did a bad commit - for example you didn't see a spelling error in a label. To fix it you would use

hg rollback
 
 
-And then redo the commit +

And then redo the commit

hg commit -m "message"
 
 
-If you can use the command history of your shell and you added the previous message via commit -m "message", that following commit just means two clicks on the arrow-key "up" and one click on "enter". +

If you can use the command history of your shell and you added the previous message via commit -m "message", that following commit just means two clicks on the arrow-key "up" and one click on "enter".

-Though it changes your history, rolling back doesn't change your files. It only undoes the last addition to your history. +

Though it changes your history, rolling back doesn't change your files. It only undoes the last addition to your history.

-But beware, that a rollback itself can't be undone. If you rollback and then forget to commit, you can't just say "give me my old commit back". You have to create a new commit. +

But beware, that a rollback itself can't be undone. If you rollback and then forget to commit, you can't just say "give me my old commit back". You have to create a new commit.

-Note: Rollback is possible, because Mercurial uses transactions when recording changes, and you can use the transaction record to undo the last transaction. This means that you can also use rollback to undo your last pull, if you didn't yet commit aything new. +

Note: Rollback is possible, because Mercurial uses transactions when recording changes, and you can use the transaction record to undo the last transaction. This means that you can also use rollback to undo your last pull, if you didn't yet commit aything new.

Sharing changes

@@ -408,9 +408,11 @@

Note: The patchbomb extension automates the email-sending, but you don't need it for this workflow.

Note 2: You can also send around bundles, which are snippets of your actual history. Just create them via

+
$ hg bundle --base FIRST_REVISION_TO_BUNDLE changes.bundle
 
 
+

Others can then get your changes by simply pulling them, as if your bundle were an actual repository

$ hg pull path/to/changes.bundle