/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Benoît Pierre
  • Date: 2011-10-23 13:53:19 UTC
  • mto: This revision was merged to the branch mainline in revision 6231.
  • Revision ID: benoit.pierre@gmail.com-20111023135319-7pc4e0sbmhp6ax96
Change upgrade code: already up-to-date exceptions are not treated as errors.

Such cases will be treated as successful updates: no error trace, just a note
to the user.

Show diffs side-by-side

added added

removed removed

Lines of Context:
93
93
one or more files. Some users like to alias ``commit`` to ``commit --strict``
94
94
so that commits fail if unknown files are found in the tree.
95
95
 
 
96
Tags for uncommitted revisions are removed from the branch unless
 
97
``--keep-tags`` was specified.
 
98
 
96
99
Note: While the ``merge`` command is not introduced until the next
97
100
chapter, it is worth noting now that ``uncommit`` restores any pending
98
101
merges. (Running ``bzr status`` after ``uncommit`` will show these.)