← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: John Arbash Meinel
  • Date: 2006-07-11 21:09:40 UTC
  • mto: This revision was merged to the branch mainline in revision 1863.
  • Revision ID: john@arbash-meinel.com-20060711210940-248917f611b6a2e5
Fix bug 31426, have uncommit keep track of pending merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
85
85
 
86
86
   * 'bzr uncommit -r 10' now uncommits revisions 11.. rather than uncommitting
87
87
     revision 10. This makes -r10 more in line with what other commands do.
88
 
     (John Arbash Meinel, #32526)
 
88
     'bzr uncommit' also now saves the pending merges of the revisions that
 
89
     were removed. So it is safe to uncommit after a merge, fix something,
 
90
     and commit again. (John Arbash Meinel, #32526, #31426)
89
91
 
90
92
  BUG FIXES:
91
93