up-thread's auto-merge should suggest combine-thread if thread has no longer has new revisions.
Bug #240825 reported by
Andrew Bennetts
This bug report is a duplicate of:
Bug #195133: Please notify when a thread becomes empty.
Edit
Remove
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Loom |
New
|
Undecided
|
Unassigned |
Bug Description
If I have a stack of work in a loom, and I submit one or more bottom threads to the base thread, then I would like "bzr up-thread" to tell me that the thread is now empty.
That is, normally up-thread merges new changes from the lower thread, but if it finds that the thread I'm moving into has no new patches (e.g. "bzr missing --mine-only -r thread:" would be empty), then I would like to be told that I can "bzr combine-thread" safely.
Here's a mockup of a session demonstrating what I want:
$ bzr show-loom
feature-3
feature-2
feature-1
=>trunk
$ bzr up-thread
Moved to thread 'feature-1'.
'feature-1' has no changes versus 'trunk'; you may want to 'bzr combine-thread'.
To post a comment you must log in.
Hi Andrew,
bug 195133 is similar to this, but uses tree difference as the guide
to whether the threads could be combined, would that be satisfactory?
That one has the advantage of having a patch available.
Thanks,
James