bzrtools- cbranch sets parent

Aaron Bentley aaron.bentley at utoronto.ca
Fri Jul 21 20:34:38 BST 2006


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

John Arbash Meinel wrote:

>>>In a 'nuclear launch codes' scenario, I think it would be bad if we made
>>>it look like the revisions were deleted, when in fact, they weren't.

> So a precursor to 'nuke' would just be 'hide'. Since nuke has a lot more
> work to do.

Yeah, as long as 'hide' doesn't look like 'nuke', that should be fine.

>>>To return to the cbranch-sets-parent thing:
>>>Is cbranch the right place for this?  Shouldn't checkout be setting the
>>>parent to be the same as the checked-out branch's parent?  This the
>>>behaviour you get with lightweight checkouts.

> 1) The first thing 'cbranch' does is 'bzr branch local sftp://remote'
> This wasn't possible before my encoding branch landed, but it is now.
> Which means that we are setting a local file:/// url as the parent for a
> remote branch. And I don't think we should be doing that.
> (When we are about to set_parent(), we should check if source is local
> and dest is not, then don't set the parent).

I think you could also argue that even if the parent link only works for
you, that's better than it working for nobody.  And let's face it, there
are hundreds of dangling parent links in the wild already.

Or, an alternative would be to set the parent in locations.conf when the
target branch is remote.

> 2) We've discussed in the past that a bound branch should actually use
> the master's parent location, rather than its own. That makes
> heavyweight act more like a lightweight. This still doesn't help my
> situation though, because if we fix (1), then the remote location
> doesn't have a parent.

I think if we do both 1 and 2, your situation is unfixable.

> So for *my* use case, cbranch should set the parent.

Okie.  I would rather have 2 than 1 though.  Setting the parent for sftp
branches in locations.conf doesn't exactly thrill me, either.

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

iD8DBQFEwSxO0F+nu1YWqI0RAnNVAJ95S2km3JaSSiUBPQvp1U2iHtvS7ACcC6rJ
91djw2XJ8s6WR0NiK4UbXBk=
=8nH1
-----END PGP SIGNATURE-----




More information about the bazaar mailing list