Question about branching / merging

[John Eckerdal]

Hi,

I have been playing a bit with Bazaar-NG just to see how it works.

I downloaded bzr-0.0.6 and installed that without any obvious problems.

The I tested the basics (creating a repository, adding/removing files and
diffing back and forwards). Most of the operations I tested seems to work
fine for me. There is one problem that I have and I can not seem to get
branching / merging to work in a way I would consider "obvious".

I reduced my problem to the following sequence:
> mkdir test
> cd test
> bzr init
> cp ../test.txt
> bzr add
> bzr commit -m "test commit"

No problems there...

Then I try to create a branch of this:

> bzr branch ./test tbranch

Which also work fine. And I modify the single file in the tbranch directory
(I added a single line). Then I committed this change.

> bzr commit -m "modified file"

Then I try the following:

> brz merge ../test

When I then do a 

> brz diff

I see that the single file has now been reverted to the state where it is on
the "main" branch. This was not what I expected since the "main" branch
was not modified (we use ClearCase at work and this is what CC does
when merging so maybe it is that I am too ClearCaseified here).

So now my question is:
What am I doing wrong? Or if this is the intended behaviour how do I get
Bazaar-NG to do what I would like it to do?

Thanks in advance,
John