| 2010-01-27 05:07:53 |
Gareth White |
description |
If you open a working tree containing non-text conflicts in Bazaar Explorer you get a "No such file" error whenever you refresh the window. You also get the same error if you try to revert the merge.
To reproduce:
* Change a file in one branch and remove it in another
* Merge the second branch to the first
* Open the tree in Bazaar Explorer
* It displays the message: "bzr: ERROR: No such file: u'path/to/the/file'"
* Refreshing the window (F5) brings up the error again
* You can ignore it and manually resolve the conflict, but if you try to revert the merge (via the GUI) you get the error again and can't proceed.
Some of the other conflict types give the same behaviour (e.g. conflicts in a binary file, same file renamed to different names). |
If you open a working tree containing non-text conflicts in Bazaar Explorer you get a "No such file" error whenever you refresh the window. You also get the same error if you try to revert the merge.
To reproduce:
* Change a file in one branch and remove it in another
* Merge the second branch to the first
* Open the tree in Bazaar Explorer
* It displays the message: "bzr: ERROR: No such file: u'path/to/the/file'"
* Refreshing the window (F5) brings up the error again
* You can ignore it and manually resolve the conflict, but if you try to revert the merge (via the GUI) you get the error again and can't proceed.
Some of the other conflict types give the same behaviour (e.g. conflicts in a binary file, same file renamed to different names).
Tested with Bazaar Explorer 0.11.2, QBzr 0.18, Bazaar 2.1.0rc1, Python 2.5.4 on Windows XP. |
|
