When merge does not change anything then should not have pending merge to commit
Bug #69489 reported by
Nicholas Allen
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Wishlist
|
Unassigned | ||
Bug Description
When merging from a branch and no changes are made bzr should say that there is nothing to do instead of having a pending merge that needs to be committed. When I run "bzr diff" I get empty output so bzr knows that there were no changes due to the merge. In this case I have not merged anything and it does not make sense to have a pending merge to commit.
Revision history for this message
| Martin Pool (mbp) wrote | #1 |
| Changed in bzr: | |
| importance: | Undecided → Wishlist |
| status: | New → Confirmed |
| tags: | added: check-for-breezy |
| tags: | removed: check-for-breezy |
To post a comment you must log in.
You can get approximately this behaviour by using 'merge --pull', which if there is no divergence between the branches will do a pull, after which you do not need to commit.
This doesn't address the case Nicholas may be asking about, which is that there are new revisions but no text or tree changes.