MYSQL/BZR P3: please mention in "bzr help diff" that -c gives diff against *left* parent
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
Medium
|
Ian Clatworthy |
Bug Description
This is a Sun/MySQL - Canonical escalation imported into Launchpad by the Canonical Support Team (internal case 6613 )
Original escalation: 2009-11-16 10:12 UTC
When a revision (revno X) is a merge revision, "bzr diff -c X" prints the diff against the leftmost parent (the first parent from the top in "bzr log -rX"). This can be misleading and can seem arbitrary. The proper way here is to use "bzr diff -r<chosen_
Could you please consider those ideas, to help the user:
- mention in "bzr help diff" that for a merge revision, -c is against the first parent, and -r<chosen_
- or make -c fail if the revision is a merge revision (no result instead of arbitrary result), returning an error message.
Thank you.
Related branches
- John A Meinel: Approve
-
Diff: 33 lines (+17/-7)1 file modifiedbzrlib/builtins.py (+17/-7)
summary: |
- please mention in "bzr help diff" that -c gives diff against *left* - parent + MYSQL/BZR P3: please mention in "bzr help diff" that -c gives diff + against *left* parent |
description: | updated |
visibility: | public → private |
Changed in bzr: | |
status: | New → Confirmed |
importance: | Undecided → Medium |
tags: | added: doc easy |
visibility: | private → public |
Changed in bzr: | |
status: | Confirmed → Fix Committed |
assignee: | nobody → Ian Clatworthy (ian-clatworthy) |
Changed in bzr: | |
milestone: | none → 2.1.0b4 |
status: | Fix Committed → Fix Released |
Dragomir, this bug is already closed, if MySQL want it open again,
please do reopen it.
Its also very odd to make it private when it was filed by Mysql as a
normal public bug - non staff have already seen it and seen the
discussion. I think it only makes sense to make a public bug become
private when private details are going to be discussed.
-Rob