~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Robert Collins
  • Date: 2005-09-06 11:09:03 UTC
  • mfrom: (1178)
  • mto: (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: robertc@robertcollins.net-20050906110903-b6be7bd6102403cb
really merge mpool

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
bzr development head
 
1
bzr-0.0.7 2005-09-02
2
2
 
3
3
  NEW FEATURES:
4
4
 
8
8
    * New expert command ``bzr find-merge-base`` for debugging merges.
9
9
 
10
10
 
 
11
  ENHANCEMENTS:
 
12
 
 
13
    * Much better merge support.
 
14
 
 
15
    * merge3 conflicts are now reported with markers like '<<<<<<<'
 
16
      (seven characters) which is the same as CVS and pleases things
 
17
      like emacs smerge.
 
18
 
 
19
 
11
20
  BUG FIXES:
12
21
 
13
22
    * ``bzr upgrade`` no longer fails when trying to fix trees that
14
23
      mention revisions that are not present.
15
24
 
 
25
    * Fixed bugs in listing plugins from ``bzr plugins``.
 
26
 
 
27
    * Fix case of $EDITOR containing options for the editor.
 
28
 
 
29
    * Fix log -r refusing to show the last revision.
 
30
      (Patch from Goffredo Baroncelli.)
 
31
 
 
32
 
 
33
  CHANGES:
 
34
 
 
35
    * ``bzr log --show-ids`` shows the revision ids of all parents.
 
36
 
 
37
    * Externally provided commands on your $BZRPATH no longer need
 
38
      to recognize --bzr-usage to work properly, and can just handle
 
39
      --help themselves.
 
40
 
16
41
 
17
42
  LIBRARY:
18
43