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 |
3251.4.3 | 17 years ago | Aaron Bentley | More renames and cleanups | 8.2 KB |
|
|
|
account.py |
2980 | 17 years ago | Canonical.com Patch Queue Manager | (robertc) Improved lp:/// URL support for the Laun | 2.1 KB |
|
|
|
lp_directory.py |
3373.1.1 | 17 years ago | John Arbash Meinel | Trivial warning message update when user has not r | 4.3 KB |
|
|
|
lp_registration.py |
3376.2.4 | 17 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 9.6 KB |
|
|
|
test_account.py |
2898.3.10 | 17 years ago | James Henstridge | Make LaunchpadAccountTests a TestCaseInTempDir so | 3.4 KB |
|
|
|
test_lp_directory.py |
3251.4.3 | 17 years ago | Aaron Bentley | More renames and cleanups | 8.1 KB |
|
|
|
test_lp_service.py |
3221.4.2 | 17 years ago | Martin Pool | Add in thumpers tests for selection of the right L | 3.4 KB |
|
|
|
test_register.py |
3376.2.15 | 17 years ago | Martin Pool | Fix assertions in Launchpad registration tests | 13.7 KB |
|
|