/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 HACKING

  • 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:
HACKING
1
 
Coding style
2
 
------------
3
 
Dulwich tries to follow PEP-8 where possible. docstrings should use 
4
 
restructuredText.
5
 
 
6
 
Testing
7
 
-------
8
 
The aim is to have unit tests for all functionality: If you add functionality
9
 
please provide matching tests. If you fix a bug, it would be nice if you could
10
 
add a test that reproduces the bug (so that we can prevent regressions).