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 |
4189.1.1 | 16 years ago | Martin Pool | merge update to FSF address | 7.5 KB |
|
|
|
format_custom.py |
4250.1.1 | 16 years ago | Jelmer Vernooij | Fix version-info in empty branches. | 3.3 KB |
|
|
|
format_python.py |
4250.1.1 | 16 years ago | Jelmer Vernooij | Fix version-info in empty branches. | 3.2 KB |
|
|
|
format_rio.py |
4216.4.4 | 16 years ago | Jelmer Vernooij | Set 'revision' hook as introduced in 1.15. | 3.2 KB |
|
|