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 |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 5.9 KB |
|
|
|
heavily_merged.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.6 KB |
|
|
|
kernel_like.py |
3376.2.4 | 17 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 7.9 KB |
|
|
|
many_commit.py |
2052.3.4 | 19 years ago | John Arbash Meinel | [merge] bzr.dev | 2.3 KB |
|
|
|
simple_many_commit.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.5 KB |
|
|