To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Canonical.com Patch Queue Manager
- Date: 2011-06-28 12:18:33 UTC
- mfrom: (5988.2.3 688101-duplicate-ids)
- Revision ID: pqm@pqm.ubuntu.com-20110628121833-ax14ogkh8ks922nu
(vila) Do not generate path conflicts if a corresponding content conflict
exists. (Vincent Ladeuil)
exists. (Vincent Ladeuil)
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
5947.1.2 | 14 years ago | Vincent Ladeuil | Clarify policy about medusa. | 2.7 KB |
|
|
|
medusa_based.py |
5247.5.29 | 15 years ago | Vincent Ladeuil | Fixed as per jam's review. * bzrlib/tests/test_se | 10.3 KB |
|
|
|
pyftpdlib_based.py |
5947.1.1 | 14 years ago | Vincent Ladeuil | Support pyftplib-0.6.0 as an ftp test server | 9.1 KB |
|
|