understanding some of the basics

[John Gabriele]

On Sat, Oct 16, 2010 at 7:46 PM, Neil Martinsen-Burrell
<nmb at wartburg.edu> wrote:
> On 2010-10-15 20:38 , John Gabriele wrote:
>>
>> Ah, ok. Can you tell me how this typical usage works out in practice?
>> {snip}
>
> ~/the-proj is a top-level directory that usually contains branches within
> it, one of which is often named "trunk":
>
> $ bzr init-repo ~/the-proj

Ah! Shared repository. I see now.

> $ cd ~/the-proj
> $ bzr init trunk
> $ cd trunk
> # hack, hack, hack: edit, bzr commit, repeat
> $ bzr tag "works-ok" # marks the current revision of trunk
> $ bzr branch . ../crazy-feature
> $ cd ../crazy-feature
> # hack, hack, hack: edit, bzr commit, repeat
> $ cd ../trunk
> $ bzr merge ../crazy-feature
> # test the result of the merge
> $ bzr commit -m "merged crazy feature"

After merging, is it ok to simply `rm -fr ../crazy-feature`, or will
the shared repo get confused?

> My suggestion is that you try this in a temporary directory and files with
> pretend content to see how it works.

Certainly. :)

Thanks, Neil. Very helpful!

---John