Re: [Monotone-devel] branches

[Daniel Carosone]

On Fri, Jan 11, 2008 at 12:01:37PM +1100, Brian May wrote:
> I have the following tree:
> 
> A1
> |\
> | \
> |  \
> A2  B2
> |   |
> A3  B3
> |
> A4
> |
> A5
> 
> 
> At this stage, I realize that the B changes are going to require more
> work then I initially anticipated. I would like to move B into a
> separate branch.
> 
> I think this is easy, just add another branch certificate to B2 and
> B3.

Yes, almost. This will *add* them to the new branch, rather than
*move* them, as you suspected.
 
> However, won't monotone still see two heads in the original branch?

Yep.

> If so, what is the correct way to proceed?

You have several options.  

If you haven't yet published B2 & B3 (or, more properly, their branch
certs on the original name) you can kill those certs; this requires
some trivial sql.

You can merge B3 back to A5, undoing all the changes for the new rev
on branch A.  If you do this, you should also re-start the branch from
some point below there, so that these undo changes don't get
propagated back to the b branch next time you try to catch it up with
head.  Pluck can be handy for this.

Or, best of all, you can issue a suspend cert for B3 on the a-branch.
That will stop B3 being considered a head of that branch (but not any
children that are on that branch, and not for any other branches.

--
Dan.

pgptiEBOFzZte.pgp
Description: PGP signature