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

Blake Winton bwinton at latte.ca
Mon Mar 10 19:37:24 GMT 2008


John Arbash Meinel wrote:
> Forest Bond wrote:
> | I must have misunderstood combine-thread.  I figured I would commit in 
> | a thread,
> | and then combine thread would push those commits down into thread below.
> | Rather, it seems that those commits disappear.
> 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.
> 
> Which sounds like it just nukes the current thread and changes you to 
> the one underneath.
> 
> 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.

Yup, that's pretty much what it did for me.  I don't know if it nuked the 
current thread, but since all the changes from the current thread had been 
merged into the underlying thread already, I didn't mind.  The current thread 
was certainly gone after the combine-thread.

While I didn't miss the requirement of --force, I think it's probably a good idea.

Later,
Blake.



More information about the bazaar mailing list