← 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: Martin
  • Date: 2009-11-28 00:48:03 UTC
  • mto: This revision was merged to the branch mainline in revision 4853.
  • Revision ID: gzlist@googlemail.com-20091128004803-nirz54wazyj0waf8
MergeDirective.from_lines claims to want an iterable but currently requires a list, rewrite so it really wants an iterable

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