No diff shown when releasing after a merge
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Ezbzr |
New
|
Undecided
|
Unassigned | ||
Bug Description
Here's a scenario that causes an unexpected missing diff (or at least did in this case, I haven't tried to reproduce):
1. Create a branch based on the production server.
2. Make a change to code in the branch.
3. Commit the change.
4. Bzr Release the change to production server.
5. Bzr Pull from the production server.
6. Bzr Release the change to other (test) server.
Expected:
Release should show the diff of the change committed in 3 above, just like it did when releasing in 4 and ask if you want to release the change.
Buggy behavior:
Release shows the merge (pull) from 5 in the log, but no diff before asking if you want to release it.
If you go ahead with the release, despite it showing no changes, you end up with a change committed to the test server as you'd want. I didn't try it, but I suspect bzr missing would also show the change.
This seems to happen rarely in my use. I suspect that the pull is what caused the different behavior.
