Ending a (Feature) Branch

[Eric Berry]

Hi Brendan,

On Tue, Apr 6, 2010 at 8:54 PM, Brendan Simon (eTRIX) <
brendan.simon at etrix.com.au> wrote:

> I've had a look at the online docs and can't find anything that shows
> how to end a Feature Branch (or any branch).
>
> I have created a branch, made changes and committed, then merged back
> into the parent branch.  The Feature Branch is no longer required so how
> do I delete it ??
>
> Do I just do a local rmdir ??
>

If you've merged your feature branch back into your parent branch, then as
far as I know, yes, you can simply delete the branch directory.


>
> What about history of this branch ??  I guess if it is not a shared repo
> then all the history is in the branch so therefore deleting the dir also
> deletes all it's history.  Correct ??
>

If you do a 'bzr log -n0' (or 'bzr log --include-merges') in your parent
branch you should see all the history from your feature branch.

Like:
[quote]
revno: 56 [merge]
committer: eberry
branch nick: trunk2
timestamp: Sun 2010-04-04 14:17:30 -0700
message:
  Adding basic outing view page.
    ------------------------------------------------------------
    revno: 54.1.1
    committer: eberry
    branch nick: trunk
    timestamp: Fri 2010-04-02 01:26:18 -0700
    message:
      Ticket #40: Creating response page.
    ------------------------------------------------------------
    revno: 54.1.2 [merge]
    committer: eberry
    branch nick: trunk
    timestamp: Sun 2010-04-04 14:02:31 -0700
    message:
      Merging in alex's changes.
[/quote]


>
> '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?



-- 
Learn from the past. Live in the present. Plan for the future.
Blog: http://www.townsfolkdesigns.com/blogs/elberry
jEdit <http://www.jedit.org> - Programmer's Text Editor
Bazaar <http://bazaar.canonical.com> - Version Control for Humans
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20100406/0f2b8887/attachment-0001.htm