To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: John Arbash Meinel
- Date: 2008-07-09 21:42:24 UTC
- Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.
To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.
To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
3431.3.11 | 17 years ago | Andrew Bennetts | Push remote_path_from_transport logic into SmartCl | 22.2 KB |
|
|
|
_pycurl.py |
3430.3.1 | 17 years ago | Vincent Ladeuil | Fix #230223 by making both http implementations ra | 14.5 KB |
|
|
|
_urllib.py |
3453.4.1 | 17 years ago | Andrew Bennetts | Better infrastructure on SmartClientMedium for tra | 6.3 KB |
|
|
|
_urllib2_wrappers.py |
3431.2.1 | 17 years ago | Vincent Ladeuil | Make both http implementations raise appropriate e | 53.5 KB |
|
|
|
ca_bundle.py |
2298.5.3 | 18 years ago | Alexander Belchenko | added comment about excluding cwd from PATH | 2.6 KB |
|
|
|
response.py |
3408.6.3 | 17 years ago | Andrew Bennetts | Docstring/NEWS tweaks requested by Ian's review. | 12.1 KB |
|
|
|
wsgi.py |
3245.6.1 | 17 years ago | Andrew Bennetts | Merge from bzr.dev. | 7.3 KB |
|
|