up-thread's auto-merge should suggest combine-thread if thread has no longer has new revisions.

[Andrew Bennetts]

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'.

[James Westby (james-w)]

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

[Andrew Bennetts (spiv)]

That's probably just as good. It certainly seems to satisfy my use-case. I'll mark this one as a dupe of that one.

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Andrew Bennetts wrote:
> 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.

I would like combine-thread renamed to "delete-thread" before we do
that. Otherwise, the consequences are not clear enough.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIWb0Q0F+nu1YWqI0RAuxJAJ9wtZXDgS76vg+a1kNuw4JFcjEwJACfaoIV
rT8XqI0BGZJpmBVjhqyyGzE=
=Szl0
-----END PGP SIGNATURE-----