ability to ignore conflicts outside of THIS root
Bug #634982 reported by
Jelmer Vernooij
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
| bzr-builder |
Triaged
|
Wishlist
|
Unassigned | ||
Bug Description
affects bzr-builder
affects bzr
I have a couple of source recipe builds that build packages that are
part of a larger upstream tree (samba). I have created these packages by
using "bzr split".
Since merging from upstream merges in changes to files that are no
longer in the tree, I always get conflicts for them. It would be nice if
there was an option to "bzr merge" to say "ignore everything not under
my tree root".
Related, it would be nice if there was a way to use this option from
bzr-builder so I can add daily builds for various things in the Samba
tree that are packaged independently.
Revision history for this message
| Vincent Ladeuil (vila) wrote | #1 |
| Changed in bzr: | |
| importance: | Undecided → Medium |
| status: | New → Confirmed |
| tags: | added: conflicts |
Revision history for this message
| Robert Collins (lifeless) wrote Re: [Bug 634982] Re: ability to ignore conflicts outside of THIS root | #2 |
| Changed in bzr-builder: | |
| importance: | Undecided → Wishlist |
| status: | New → Triaged |
| tags: | added: check-for-breezy |
To post a comment you must log in.
This is kind of the intent behind 'bzr resolve --take-this' (for all files outside of THIS root, don't bother me with the OTHER
modifications, I just don't care) except that you'd really want to do that at merge time.
A per-file merge hook should be able to call the relevant code though.
From a UI point of view we certainly need a way to *control* which options are set for which files, but there may be
a short cut for your particular use case.