bzr combine-thread: where'd my code go?

[Forest Bond]

Hi,

On Mon, Mar 10, 2008 at 02:28:41PM -0500, John Arbash Meinel wrote:
> As I understand it, combine-thread is designed to be done when you want to
> remove a thread. I would have thought that it would check if everything is
> merged first.
>
> However, looking at 'bzr combine-thread --help' I see:
>
> ~  In precise terms this will:
> ~   * Remove the entry from the loom for the current thread.
> ~   * Change threads to the thread below.
>
> Which sounds like it just nukes the current thread and changes you to the one
> underneath.

Interesting.  For some reason, I assumed that combine-thread would do the merge
for me.  Now that I think about it, I see why it's better this way.  Putting the
user in charge of merging supports more work flows (i.e. send patch upstream,
merge there, pull upstream, combine-thread).

Maybe it should be renamed "kill-thread", or "drop-thread"?  That seems more
accurate.  "combine-thread" implies merging to me.

> Can someone else using looms confirm? I don't use it much myself. It certainly
> sounds like a destructive command which should check that the tip is already
> merged, and require something like --force if they aren't.

Yes, I think this would be a good idea.

-Forest
-- 
Forest Bond
http://www.alittletooquiet.net
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080310/e2693b97/attachment.pgp