Bazaar

Advanced search

Ubuntu also tracks bugs for packages derived from this project: bzr in Ubuntu.

1 → 66 of 66 results First • Previous • Next • Last
High
Confirmed
#82555 Merging to an empty branch doesn't work
Bazaar 172
High
Confirmed
#418929 merge_inner bug causes wrong merges
Bazaar 6
High
Confirmed
#419782 'bzr merge foo' does not honour 'bzr switch' lookup heuristic
Bazaar 12
High
Confirmed
#421360 switch won't let me switch with a pending merge
Bazaar 6
High
Confirmed
#494197 Fail to create .BASE when getting conflicts in some criss-cross merges
Bazaar 16
High
Confirmed
#530584 File conflict when merge back packaging branch to upstream
Bazaar 6
High
Confirmed
#632704 Can't merge a directory deletion in a wt with a pending subdirectory deletion
Bazaar 10
High
Confirmed
#793783 merge with a merge directive in a lightweight checkout from a bzr+ssh:// branch fails
Bazaar 6
Medium
Confirmed
#67174 record cherry-pick merges
Bazaar 118
Medium
Confirmed
#138802 tag deletion does not propagate
Bazaar 40
Medium
Confirmed
#141456 merging of branches with nested trees fails when commiting with error about multiple write groups
Bazaar 6
Medium
Confirmed
#143977 Automatic methods to resolve .moved directories
Bazaar 2
Medium
Confirmed
#235441 lca doesn't report delete + change as conflict
Bazaar 2
Medium
Confirmed
#240762 merge preview doesn't handle kind change from directory to symlink: "exceptions.AttributeError: children"
Bazaar 2
Medium
Confirmed
#243359 bzr merge shows file as modified although they did not change
Bazaar 6
Medium
Confirmed
#248411 too many conflicts when merging a revision range that includes some cherrypicked merges
Bazaar 2
Medium
Confirmed
#248607 bzr merge with missing revision error message is too long
Bazaar 2
Medium
Confirmed
#264459 'bzr merge --lca' does not conflict on permutated lines
Bazaar 2
Medium
Confirmed
#278346 merge produces huge unnecessary conflicts
Bazaar 2
Medium
Confirmed
#307316 Contents conflicts in checkouts end up in .OTHER being added to the repository
Bazaar 6
Medium
Confirmed
#318620 When merging two branches without common ancestry, Bazaar provides no means to map file IDs
Bazaar 112
Medium
Confirmed
#323095 syntax to reverse a revision is confusing
Bazaar 12
Medium
Confirmed
#338516 "Unknown kind 'relocated'" error merging after reverting unversioned parent conflict
Bazaar 16
Medium
Confirmed
#364336 bzr merge should allow user to ignore changes in deleted files
Bazaar 12
Medium
Confirmed
#373719 bzr merge should handle patches
Bazaar 6
Medium
Confirmed
#384422 bzr merge --uncommitted of self results in traceback
Bazaar 6
Medium
Confirmed
#483388 merge lies about lacking common ancestors when it has multiple choices
Bazaar 18
Medium
Confirmed
#504835 confusing error "The file id ... is not present in the tree ..."
Bazaar 6
Medium
Confirmed
#509325 merge & tree shape alteration hook for packaging
Bazaar 6
Medium
Confirmed
#522740 Merging a branch into empty branch shows negative revision numbers in bzr log
Bazaar 16
Medium
Confirmed
#529213 news_merge should be configurable, in-tree
Bazaar 6
Medium
Confirmed
#548484 want per-file configuration to turn off automatic merging
Bazaar 10
Medium
Confirmed
#548523 bzr merge of a large project locally can sit for a while with no indication of what it is doing
Bazaar 6
Medium
Confirmed
#562669 merge should show base always, or at least configurably
Bazaar 10
Medium
Confirmed
#567628 would like to be able to change my answer in interactive merge
Bazaar 6
Medium
Confirmed
#598332 default merge source is confusing (docs mismatch behaviour, behaviour is complex)
Bazaar 6
Medium
Confirmed
#616749 Incorrect merge - Lines missing inside conflict markers
Bazaar 8
Medium
Confirmed
#618614 bzr revert of merged and then changed file after --forget-merges leaves file on disk and reports about conflict
Bazaar 6
Medium
Confirmed
#636715 need docs of merge algorithm options
Bazaar 6
Medium
Confirmed
#680336 merge should include pending merges when computing merge base
Bazaar 8
Medium
Confirmed
#705625 shelve does not shelve pending merges and conflicts
Bazaar 6
Medium
Confirmed
#709084 Previewing merge directive meta-data contents is not possible
Bazaar 16
Medium
Confirmed
#722892 conflicts should be given better names than .moved
Bazaar 6
Medium
Confirmed
#790646 ConfigurableFileMerger should accept globs
Bazaar 6
Medium
Confirmed
#875698 uncommit/revert sometimes deletes, sometimes unversions
Bazaar 6
Medium
Confirmed
#897313 "bzr merge" should mention when it is using a custom merger
Bazaar 14
Low
Confirmed
#37829 dry-run option for pull, merge, etc
Bazaar 14
Low
Confirmed
#50943 Confusing (and probably not a real) merge conflict
Bazaar 2
Low
Confirmed
#62904 merge from bundle should allow revision specification
Bazaar 2
Low
Confirmed
#81758 'bzr help merge' should describe merging a single file
Bazaar 6
Low
Confirmed
#235943 merge --uncommitted is late warning about not working remotely
Bazaar 2
Low
Confirmed
#274100 traceback running merge involving non-ascii filenames with ascii locale set
Bazaar 4
Low
Confirmed
#361216 ability to disable merge on certain trees
Bazaar 6
Low
Confirmed
#395906 NoSuchRevision traceback when given revid is not in the default merge source
Bazaar 8
Low
Confirmed
#409555 "bzr remerge" should not remerge resolved conflicts
Bazaar 8
Low
Confirmed
#415231 [wishlist] provide support for `bzr merge --preview --using XXX`
Bazaar 6
Low
Confirmed
#424781 Merge into PreviewTree lists only a single entry with list_files
Bazaar 0
Low
Confirmed
#436559 confusing conflicts when adding files to roots with different ids
Bazaar 6
Low
Confirmed
#534205 Make merge fail faster if there are no common ancestors
Bazaar 6
Low
Confirmed
#801344 merge -i should ignore files in previously-ignored directories
Bazaar 6
Wishlist
Confirmed
#60467 When doing a merge into a tree that already has merged, the common base detection should take all parents into consideration.
Bazaar 2
Wishlist
Confirmed
#62249 merge from bundles should support io redirection
Bazaar 2
Wishlist
Confirmed
#126476 automatically run editor on conflicted files after merge
Bazaar 2
Wishlist
Confirmed
#348227 want a way to record a pending merge without merging the texts
Bazaar 2
Wishlist
Confirmed
#409643 want to preview merge conflicts
Bazaar 8
Undecided
Confirmed
#244115 merge between two branches fails
Bazaar 2
1 → 66 of 66 results First • Previous • Next • Last
Bug supervisor:
bzr-qa

Series-targeted bugs

Milestone-targeted bugs