/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: Robert Collins
  • Date: 2005-10-20 09:20:46 UTC
  • Revision ID: robertc@robertcollins.net-20051020092046-f41cd3e0c9896b98
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)

'merge_flex' no longer calls conflict_handler.finalize(), instead that
is called by merge_inner. This is so that the conflict count can be 
retrieved (and potentially manipulated) before returning to the caller
of merge_inner. Likewise 'merge' now returns the conflict count to the
caller. (Robert Collins)

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.