« back to all changes in this revision
Viewing changes to bzrlib/selftest/testoptions.py
- 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)
- files modified:
- NEWS
added
removed
bzrlib/selftest/testoptions.py
