- Committer: Vincent Ladeuil
- Date: 2010-03-08 09:31:12 UTC
- mto: (4597.8.2 531967-unify-name-conflicts) (5112.1.1 integration)
- 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.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
bzrlib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
contrib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
doc
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
man1
|
2425.1.1 | 17 years ago | Robert Collins | ``make docs`` now creates a man page at ``man1/bzr |
|
||
|
tools
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
.bzrignore |
4679.3.76 | 15 years ago | John Arbash Meinel | Rename StaticTupleInterner => SimpleSet. This is | 1.2 KB |
|
|
|
.rsyncexclude |
1185.33.36 | 18 years ago | Martin Pool | Exclude more files from dumb-rsync upload | 203 bytes |
|
|
|
.testr.conf |
5060.2.1 | 14 years ago | Robert Collins | * bzr now has a ``.testr.conf`` file in its source | 93 bytes |
|
|
|
BRANCH.TODO |
4597.3.56 | 14 years ago | Vincent Ladeuil | Add a NEWS entry and prepare submission. | 150 bytes |
|
|
bzr |
5053.1.1 | 14 years ago | Martin Pool | Merge 2.1 back to trunk | 5.2 KB |
|
|
|
bzr.ico |
3688.3.3 | 16 years ago | John Arbash Meinel | An updated transparent icon for bzr. | 12.7 KB |
|
|
|
COPYING.txt |
1861.2.9 | 18 years ago | Alexander Belchenko | rename gpl.txt => COPYING.txt | 17.5 KB |
|
|
|
INSTALL |
4988.4.2 | 14 years ago | Martin Pool | Change url to canonical.com or wiki, plus some doc | 1.4 KB |
|
|
|
Makefile |
5053.1.1 | 14 years ago | Martin Pool | Merge 2.1 back to trunk | 14.4 KB |
|
|
|
MANIFEST.in |
4634.125.2 | 14 years ago | John Arbash Meinel | Update the MANIFEST.in file. | 118 bytes |
|
|
|
NEWS |
5068.1.1 | 14 years ago | Vincent Ladeuil | Merge 2.1 into trunk including fixes for #331095, | 437 KB |
|
|
|
NEWS-template.txt |
4634.136.1 | 14 years ago | Ian Clatworthy | NEWS section template into a separate file | 277 bytes |
|
|
|
profile_imports.py |
5027 | 14 years ago | Canonical.com Patch Queue Manager | (mbp) add import-tariff tests | 6.1 KB |
|
|
|
README |
4988.4.3 | 14 years ago | Martin Pool | Correction to url from review: https://code.edge. | 2.2 KB |
|
|
|
README_BDIST_RPM |
4634.125.1 | 14 years ago | Joe Julian | Added MANIFEST.in to allow bdist_rpm to have all t | 397 bytes |
|
|
|
setup.py |
4988.4.2 | 14 years ago | Martin Pool | Change url to canonical.com or wiki, plus some doc | 26.5 KB |
|
|
|
TODO |
2382.2.5 | 17 years ago | Martin Pool | Contents of TODO file moved into bug tracker | 115 bytes |
|
|