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 | 4.5 KB |
|
|
|
branch.py |
4288.1.7 | 16 years ago | Robert Collins | Add new remote server verb Branch.set_parent_locat | 11.3 KB |
|
|
|
bzrdir.py |
4294.2.8 | 16 years ago | Robert Collins | Reduce round trips pushing new branches substantia | 17 KB |
|
|
|
client.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 9.3 KB |
|
|
|
medium.py |
4031.3.2 | 16 years ago | Matt Nordhoff | Merge bzr.dev, fixing conflicts. | 33.8 KB |
|
|
|
message.py |
4294.2.7 | 16 years ago | Robert Collins | Start building up a BzrDir.initialize_ex verb for | 13.2 KB |
|
|
|
packrepository.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.5 KB |
|
|
|
protocol.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 49.5 KB |
|
|
|
repository.py |
4199 | 16 years ago | Canonical.com Patch Queue Manager | (robertc) Negatively cache ghosts and misses durin | 24.4 KB |
|
|
|
request.py |
4294.2.8 | 16 years ago | Robert Collins | Reduce round trips pushing new branches substantia | 21.6 KB |
|
|
|
server.py |
4031.3.2 | 16 years ago | Matt Nordhoff | Merge bzr.dev, fixing conflicts. | 12.5 KB |
|
|
|
vfs.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 7 KB |
|
|