- 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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
cache-remote-revisions.diff |
688 | 19 years ago | Martin Pool | - add deferred patch from abentley to fetch rem | 4.8 KB |
|
|
|
cache_weave_inclusions.diff |
1327 | 19 years ago | Martin Pool | - draft patch to cache weave inclusions (doesn't | 2.5 KB |
|
|
|
find-touching-from-seq.diff |
631 | 19 years ago | Martin Pool | - add deferred patch for finding touching patches | 2.7 KB |
|
|
|
meta-data-in-inventory.patch |
677 | 19 years ago | Martin Pool | - draft 'meta' command by john | 10.4 KB |
|
|
|
ndiff.patch |
817 | 19 years ago | Martin Pool | - Deferred patch that uses Python ndiff format. | 4.7 KB |
|
|