To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Robert Collins
- Date: 2005-10-18 23:47:12 UTC
- mfrom: (0.2.1)
- Revision ID: robertc@robertcollins.net-20051018234712-45a83974f691c860
Bugfix the new pull --clobber to not generate spurious conflicts.
When --clobber clobbered the history, a bad merge base was used.
Supporting this:
* merge.merge_inner now has tempdir as an optional parameter. (Robert Collins)
* Tree.kind is not recorded at the top level of the hierarchy, as it was
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
(Robert Collins)
When --clobber clobbered the history, a bad merge base was used.
Supporting this:
* merge.merge_inner now has tempdir as an optional parameter. (Robert Collins)
* Tree.kind is not recorded at the top level of the hierarchy, as it was
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
(Robert Collins)
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
1442.1.54 | 19 years ago | Robert Collins | Teach store.copy_all about fileid suffixes | 10.5 KB |
|
|
|
compressed_text.py |
1442.1.54 | 19 years ago | Robert Collins | Teach store.copy_all about fileid suffixes | 3.6 KB |
|
|
|
text.py |
1442.1.51 | 19 years ago | Robert Collins | teach iter about suffixes | 1.5 KB |
|
|
|
weave.py |
1442.1.45 | 19 years ago | Robert Collins | replace __contains__ calls in stores with has_id | 4.6 KB |
|
|