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

John Arbash Meinel john at arbash-meinel.com
Mon Mar 10 19:28:41 GMT 2008


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

Forest Bond wrote:
| Hi,
|
| 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.
|
| I haven't done any `bzr record'ing just yet.  Should I have done that before
| combine-thread?
|
| No need to worry, I'm not so foolish as to leave my only copy of source code
| under the control of a brand new bzr plugin :)
|
| -Forest

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.

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.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFH1YvpJdeBCYSNAAMRAs2tAJ9pIZ1TQWV6HskbqJ5Qx4VEVI3RFACfWMLR
QgTIlA83x1U8vFZxIeKJ5P4=
=0rtQ
-----END PGP SIGNATURE-----



More information about the bazaar mailing list