/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/library-interface.txt

  • Committer: John Arbash Meinel
  • Date: 2009-04-29 17:02:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4322.
  • Revision ID: john@arbash-meinel.com-20090429170236-v1oe7b235mi73cqs
https://launchpad.net/bugs/328171
Add a per-implementation test that deleting lines conflicts with modifying lines.

At the moment, I don't see a simple way to implement this for LCA merge,
so I'm just marking it as 'expectedFailure'.
However, it works for both Weave merge and for Merge3.
Fixes bug #328171

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/library-interface.txt
1
 
*****************
2
 
Library interface
3
 
*****************
4
 
 
5
 
Should have a pleasant library interface.
6
 
 
7
 
* Be clear what is supposed to be in a stable public interface and
8
 
  what is not.  (A common failing of Python programs.)
9
 
 
10
 
* If a function changes the working directory (as may be necessary to
11
 
  run patch) it should restore it.