Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.2, 0.8.3, and 0.9

stable doc: improve recovery chapter

Changeset 24234212b7c4…

Parent 52203f004e64…

by Steve Borho

Changes to 3 files · Browse files at 24234212b7c4 Showing diff from parent 52203f004e64 Diff from another changeset...

Change 1 of 1 Show Entire File doc/​source/​daily.txt Stacked
 
16
17
18
19
20
21
 
16
17
18
 
19
20
@@ -16,6 +16,5 @@
  datamine   synchronize   serve - recovery    .. vim: noet ts=4
Change 1 of 1 Show Entire File doc/​source/​index.txt Stacked
 
17
18
19
 
20
21
22
 
17
18
19
20
21
22
23
@@ -17,6 +17,7 @@
  quick   daily   settings + recovery   faq    Indices and tables
Change 1 of 1 Show Entire File doc/​source/​recovery.txt Stacked
 
10
11
12
13
14
15
 
 
 
 
 
 
16
17
18
19
 
 
 
 
 
 
20
21
22
23
 
 
 
 
24
25
26
27
 
28
29
 
10
11
12
 
 
 
13
14
15
16
17
18
19
20
 
 
21
22
23
24
25
26
27
28
 
 
29
30
31
32
33
34
35
 
36
37
38
@@ -10,20 +10,29 @@
 The buttons all equate to a single Mercurial command (save stop, obviously)    :guilabel:`clean` - :command:`hg update --clean` - performs a clean checkout of the existing - working directory parent revision. Undoes a partially completed - merge. + :command:`hg update --clean` - performs a clean checkout of the + current (first) working directory parent revision. Undoes an + aborted or partially completed merge. This will destroy all + changes, please use carefully. You should shelve any changes you + wish to keep before using this command. +    :guilabel:`rollback` - :command:`hg rollback` - undo operation for most recent repository - transaction. Can undo a commit or pull. + :command:`hg rollback` - undo operation for the most recent + repository transaction, which is usually a commit or a pull. There + is no way to know for certain what operation will be rolled back, so + only use this in situations where you know what the last transaction + was. +    :guilabel:`recover` - :command:`hg recover` - recover from a badly aborted operation. Rarely - necessary, Mercurial will tell you if it needs to be performed. + :command:`hg recover` - recover from a badly aborted transaction. + This is rarely necessary, and Mercurial will inform you if it ever + needs to be performed. +    :guilabel:`verify`   :command:`hg verify` - perform a consistency check of the contents of your - repository + repository. Completely safe.    .. vim: noet ts=4