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 |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1 KB |
|
|
|
ca.crt |
2929.3.13 | 18 years ago | Vincent Ladeuil | Update ssl generated files. Put the branch on the | 2.3 KB |
|
|
|
ca.key |
2929.3.13 | 18 years ago | Vincent Ladeuil | Update ssl generated files. Put the branch on the | 3.2 KB |
|
|
create_ssls.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 9.1 KB |
|
|
|
server.crt |
2929.3.18 | 17 years ago | Vincent Ladeuil | Fix the server name in script and ssl files. * bz | 1.9 KB |
|
|
|
server.csr |
2929.3.18 | 17 years ago | Vincent Ladeuil | Fix the server name in script and ssl files. * bz | 1.7 KB |
|
|
|
server_with_pass.key |
2929.3.18 | 17 years ago | Vincent Ladeuil | Fix the server name in script and ssl files. * bz | 3.2 KB |
|
|
|
server_without_pass.key |
2929.3.18 | 17 years ago | Vincent Ladeuil | Fix the server name in script and ssl files. * bz | 3.1 KB |
|
|