| 2009-11-17 04:06:51 |
Dragomir Minkovski |
description |
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_parent>..X".
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_parent>..X should be used if you want a non-first parent to be used.
- or make -c fail if the revision is a merge revision (no result instead of arbitrary result), returning an error message.
Thank you. |
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_parent>..X".
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_parent>..X should be used if you want a non-first parent to be used.
- or make -c fail if the revision is a merge revision (no result instead of arbitrary result), returning an error message.
Thank you.
|
|
