'merged' definition is too broad
Bug #641043 reported by
Martin Pool
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| bzr-gardener |
Fix Released
|
High
|
Vincent Ladeuil | ||
Bug Description
I have a working tree and branch with some uncommitted changes, and no new commits relative to trunk. 'bzr gardener' in the parent (repo) directory reports this one as
uncommitted: 213182-lock-tests
merged: 213182-lock-tests
bzr: warning: While processing file://
which is a bit strange.
Firstly, I would expect one line per branch - at first I only noticed the second of these.
Secondly, if the last commit on this branch is on the mainline of trunk then it's not so much 'merged' as never committed to at all.
Thanks!
Related branches
| Changed in bzr-gardener: | |
| status: | New → Confirmed |
Revision history for this message
| Vincent Ladeuil (vila) wrote | #1 |
| summary: |
- says 'merged' about trees with uncommitted changes + 'merged' definition is too broad |
| Changed in bzr-gardener: | |
| importance: | Undecided → High |
| Changed in bzr-gardener: | |
| assignee: | nobody → Vincent Ladeuil (vila) |
| status: | Confirmed → In Progress |
| Changed in bzr-gardener: | |
| status: | In Progress → Fix Released |
To post a comment you must log in.
On the *mainline*, yeah, useful distinction.
For projects with a proper mainline that is :-/
As for displaying several lines, I'm sold yet of what the output of status should be but I tend to prefer a rather large output,
easy to parse for scripts, I may add different ways to look at different parts of it for other commands, not necessarily
from the command line. In this case, reporting the status of both the working tree and the branch makes sense.
So, I'll keep the focus of this bug to the merge definition.
It's already somehow wrong to report 'merged' for a mirror branch.