To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: John Arbash Meinel
- Date: 2009-04-29 17:02:36 UTC
- Revision ID: john@arbash-meinel.com-20090429170236-v1oe7b235mi73cqs
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
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
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
4283.3.1 | 16 years ago | Vincent Ladeuil | Make built-in plugins display the same version tha | 10.4 KB |
|
|
|
account.py |
4304.2.1 | 16 years ago | Vincent Ladeuil | Fix bug #367726 by reverting some default user han | 3.3 KB |
|
|
|
lp_directory.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 4.1 KB |
|
|
|
lp_registration.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 11.3 KB |
|
|
|
test_account.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 5.2 KB |
|
|
|
test_lp_directory.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 8.1 KB |
|
|
|
test_lp_open.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 3.6 KB |
|
|
|
test_lp_service.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 7.7 KB |
|
|
|
test_register.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 13.7 KB |
|
|