← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to BRANCH.TODO

More cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
BRANCH.TODO
9
9
.BASE, .THIS, .OTHER, .moved can't be added nor committed.
10
10
https://bugs.edge.launchpad.net/bzr/+bug/414589
11
11
 
 
12
More conflict types should be handled by --auto (and the option
 
13
added).
 
14
https://bugs.edge.launchpad.net/bzr/+bug/344013
 
15
https://bugs.edge.launchpad.net/bzr/+bug/389396
 
16
 
12
17
https://bugs.edge.launchpad.net/bzr/+bug/236724
13
18
https://bugs.edge.launchpad.net/bzr/+bug/228506
14
19
https://bugs.edge.launchpad.net/bzr/+bug/113809
25
30
TODO:
26
31
=====
27
32
 
28
 
- file a bug about more conflicts that *can* be handled by --auto
29
 
  (at least some content conflicts can)
30
 
 
31
33
- make sure .moved files can't be committed !
32
34
 
33
35
- tests with '.diverted' files ?