To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4597.7.9.
- Committer: Vincent Ladeuil
- Date: 2010-03-08 09:31:12 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-20100308093112-kcczklem5on3z82k
Resolve the PathConflict when the file-id has been lost due to bug #531967.
* bzrlib/conflicts.py:
(PathConflict._resolve): Fix comment.
(PathConflict._get_or_infer_file_id): Get back the file-id by
searching in the ancestry.
(PathConflict.action_take_this, PathConflict.action_take_other):
When file-id is not None, we need to find it back before being
able to resolve the conflict.
* bzrlib/conflicts.py:
(PathConflict._resolve): Fix comment.
(PathConflict._get_or_infer_file_id): Get back the file-id by
searching in the ancestry.
(PathConflict.action_take_this, PathConflict.action_take_other):
When file-id is not None, we need to find it back before being
able to resolve the conflict.
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
