~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to TODO

  • Committer: Martin Pool
  • Date: 2005-07-11 06:34:55 UTC
  • Revision ID: mbp@sourcefrog.net-20050711063455-0f0b87a770873373
todo

Show diffs side-by-side

added added

removed removed

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