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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
configobj
|
1185.12.49 | 19 years ago | Aaron Bentley | Switched to ConfigObj |
|
||
|
effbot
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
elementtree
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
tests
|
2613.1.2 | 18 years ago | Martin Pool | Move bencode tests into util.tests |
|
||
__init__.py |
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late | Empty |
|
|
|
bencode.py |
4032.1.1 | 16 years ago | John Arbash Meinel | Merge the removal of all trailing whitespace, and | 4.3 KB |
|
|
|
simplemapi.py |
3943.8.1 | 16 years ago | Marius Kruger | remove all trailing whitespace from bzr source | 8.2 KB |
|
|