← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/library-interface.txt

  • Committer: John Arbash Meinel
  • Date: 2008-03-04 14:25:46 UTC
  • mto: This revision was merged to the branch mainline in revision 3279.
  • Revision ID: john@arbash-meinel.com-20080304142546-zuwwy0o9roo14928
Implement cherrypick support for Merge3
When merging a cherrypick, use a slightly different resolve logic.
When encountering a conflict, the new logic does not include lines that
were present in BASE that are conflicting with OTHER.
This is done since a cherrypick is (by definition) avoiding changes that
are present in the base.
(related to bug #151731)

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.