To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4597.7.14.
- Committer: Vincent Ladeuil
- Date: 2010-03-10 09:44:36 UTC
- mto: (4597.8.2 531967-unify-name-conflicts) (5112.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5113.
- Revision ID: v.ladeuil+lp@free.fr-20100310094436-b21be33p3nro45u0
Tweak the fix to not use helpers but let resolve restore the old version.
* bzrlib/merge.py:
(Merge3Merger._merge_names): Don't create helpers as it may
conflict with a related 'contents conflit'.
* bzrlib/conflicts.py:
(PathConflict.associated_filenames): No more helpers.
(PathConflict._resolve): Restore the item if needed (based on the
paths involved).
* bzrlib/merge.py:
(Merge3Merger._merge_names): Don't create helpers as it may
conflict with a related 'contents conflit'.
* bzrlib/conflicts.py:
(PathConflict.associated_filenames): No more helpers.
(PathConflict._resolve): Restore the item if needed (based on the
paths involved).
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
