/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: Canonical.com Patch Queue Manager
  • Date: 2009-09-19 00:32:14 UTC
  • mfrom: (4685.2.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20090919003214-2dli9jc4y5xhjj3n
(mbp for garyvdm) Revert rename of
        test_merge_uncommitted_otherbasis_ancestor_of_thisbasis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/undoing_mistakes.txt
134
134
which is probably only what you want if you haven't made any new commits
135
135
since then. If you have, the ``revert`` would wipe them out as well. In that
136
136
case, you probably want to use `Reverse cherrypicking
137
 
<adv_merging.html#reverse-cherrypicking>`_ instead to
 
137
<advanced_merging.html#reverse-cherrypicking>`_ instead to
138
138
back out the bad fix.
139
139
 
140
140
Note: As an alternative to using an absolute revision number (like 19), you can