- 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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
apport
|
4634.128.12 | 14 years ago | Martin Pool | Add sample apport integration glue |
|
||
|
bash
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
debian
|
4665.6.1 | 15 years ago | John Ferlito | Add a debian init script for bzr --serve |
|
||
|
emacs
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
zsh
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
add-bzr-to-baz |
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late | 223 bytes |
|
|
bzr_access |
4183.7.1 | 15 years ago | Sabin Iacob | update FSF mailing address | 7.6 KB |
|
|
|
bzr_ssh_path_limiter |
3806.1.1 | 16 years ago | Andrew Bennetts | Add contrib/bzr_ssh_path_limiter. | 550 bytes |
|
|
|
convert_to_1.9.py |
3823.3.2 | 15 years ago | John Arbash Meinel | Add a bit of help text when supplying --help. | 5.1 KB |
|
|
|
create_bzr_rollup.py |
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late | 5.5 KB |
|
|
|
newinventory.py |
4183.7.1 | 15 years ago | Sabin Iacob | update FSF mailing address | 4.3 KB |
|
|
|
pwclient.full |
4183.7.1 | 15 years ago | Sabin Iacob | update FSF mailing address | 13 KB |
|
|
|
pwk |
1583.1.2 | 18 years ago | Michael Ellerman | Update contrib/pwk for -p1 diffs from bzr | 897 bytes |
|
|
|
upload-bzr.dev |
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late | 829 bytes |
|
|