A number of new features have been added to QBzr, related to the management of your working tree. These feature are available from both qbrowse, and qcommit, and are available in the qbzr 0.16 release.
As you can see in the screen shot, we now show conflicts in the status column. Behind the scenes, “Merge conflict” uses extmerge, so that need installed and configured to work. “Mark conflict resolved” does a bzr resolve on the selected file.
“Remove” will unversion, and remove the file. It will prompt you if there are uncommitted changed that will be removed.
Moving and renameing
There are 3 new features that allow you to move or rename a file:
- You can select rename from the context menu, and enter a new name.
- You can move a file by drag it to a new folder.
- If you have renamed or moved a file outside of bzr, you can select the old path (missing), and the new path (unversoined) and chose “Mark as moved/renamed”.