← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/user-guide/undoing_mistakes.txt

  • Committer: Benjamin Rister
  • Date: 2008-05-19 00:11:39 UTC
  • mto: (3453.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3454.
  • Revision ID: bdr@decimus.net-20080519001139-uums0l71gs3wx20d
Clarified docs on bzr remove --force

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/undoing_mistakes.txt
29
29
 
30
30
This will complain about the file being modified or unknown.
31
31
If you want to keep the file, use the ``--keep`` option.
32
 
Alternatively, if you want to remove the file, use the ``--force`` option.
 
32
Alternatively, if you want to delete the file, use the ``--force`` option.
33
33
For example::
34
34
 
35
35
  bzr add foo.html
36
36
  (oops - didn't mean that)
37
37
  bzr remove --keep foo.html
38
 
  (foo.html left on disk)
 
38
  (foo.html left on disk, but deregistered)
39
39
 
40
 
On the other hand, the ``TODO`` file is deregistered and
 
40
On the other hand, the unchanged ``TODO`` file is deregistered and
41
41
removed from disk without complaint in this example::
42
42
 
43
43
  bzr add TODO