← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Martin Pool
  • Date: 2010-08-20 06:49:00 UTC
  • mfrom: (5349.1.5 234708-diff)
  • mto: This revision was merged to the branch mainline in revision 5384.
  • Revision ID: mbp@sourcefrog.net-20100820064900-hhbu782e4vi06v6d
resolve news conflicts in diff --using --diff-options branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
44
44
Bug Fixes
45
45
*********
46
46
 
 
47
* Allow using both --using and --diff-options. 
 
48
  (Matthäus G. Chajdas, #234708)
 
49
 
47
50
* ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
48
51
  previously-unversioned directory within the tree: the directory is
49
52
  marked versioned too.  
54
57
  regular expression.
55
58
  (Parth Malwankar #300062)
56
59
 
57
 
* Check if both --diff-options and --using are set, and exit with error
58
 
  in this case. (Matthäus G. Chajdas, #234708)
59
 
 
60
60
* CommitBuilder now uses the committer instead of _config.username to generate
61
61
  the revision-id.  (Aaron Bentley, #614404)
62
62