- Committer: Vincent Ladeuil
- Date: 2010-03-10 10:06:46 UTC
- mto: (4597.8.2 531967-unify-name-conflicts) (5112.1.1 integration)
- Revision ID: v.ladeuil+lp@free.fr-20100310100646-cxdu0h3y6pokm5je
Workaround bug #533547.
* bzrlib/conflicts.py:
(PathConflict._resolve, PathConflict._get_or_infer_file_id,
PathConflict._revision_tree): Workaround bug #533547 by getting
revision trees directly from the repo.
* bzrlib/conflicts.py:
(PathConflict._resolve, PathConflict._get_or_infer_file_id,
PathConflict._revision_tree): Workaround bug #533547 by getting
revision trees directly from the repo.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||