~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to TODO

  • Committer: Martin Pool
  • Date: 2005-07-07 10:13:43 UTC
  • mfrom: (0.1.95)
  • Revision ID: mbp@sourcefrog.net-20050707101342-aa2ef950004cb467
todo

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
Small things
18
18
------------
19
19
 
 
20
* Merging add of a new file clashing with an existing file doesn't
 
21
  work; add gets an error that it's already versioned and the merge
 
22
  aborts.
 
23
 
20
24
* Merge should ignore the destination's working directory, otherwise
21
25
  we get an error about the statcache when pulling from a remote
22
26
  branch.