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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
centralized_workflow.txt |
2977.1.13 | 18 years ago | Ian Clatworthy | more cleanups and creation of tutorials directory | 11.8 KB |
|
|
|
tutorial.txt |
2977.1.13 | 18 years ago | Ian Clatworthy | more cleanups and creation of tutorials directory | 21.7 KB |
|
|
|
using_bazaar_with_launchpad.txt |
4031.3.2 | 16 years ago | Matt Nordhoff | Merge bzr.dev, fixing conflicts. | 16.2 KB |
|
|