Ending a (Feature) Branch

[Brendan Simon (eTRIX)]

On 7/04/10 2:19 PM, Eric Berry wrote:
>
>
>     'bzr info' of my branches shows that they are standalone branches,
>     so I
>     can just remove the branch directory and that's the end of story,
>     right ??
>
>     If it was a shared repo, then things seem to get more complicated.
>     Google searches reveal plenty of questions on this topic but no
>     definitive answers.
>     Is there consistent way to end a branch and remove it for all types of
>     branches ??
>
>
> I don't quite understand. What do you mean by end a branch for all
> types of branches?

I was thinking of standalone versus shared, but maybe I am confused
about branches and repositories ??

Does it make sense to create a feature branch as a shared branch ??  I'm
guessing not.
If it was a shared branch, and everything is merged into the parent
branch, then blowing away the entire shared branch would be fine too,
right ??

I also noticed that branches can be stacked.  I haven't used a stacked
branch so I don't know how they really work, except that they depend on
the availability of the source branch (must be local ?? or can be remote
??).  My guess is blowing away a stacked branch would not affect the
parent branch so it has the same affect as a non-stacked branch.

So the rule is just delete your local branches when not needed any more
-- must merge to parent branch if the changes are to be kept.

The only exception seems to be if a feature branch is created in a
shared repo, and commits are made, and then the branch removed.  The
result the feature branch is still in the history of the shared repo.

So is there a 'bzr rmdir' or 'bzr branch --delete' command that would do
the 'right thing' ... if the repository is shared or not ??

Cheers, Brendan.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20100407/e13bac88/attachment.htm