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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
bzr-mode.el |
1110 | 20 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 5.2 KB |
|
|