Repeated merges possible and displayed in brzr status

[Matiyam]

Hi!

I am not sure if this is a bug, let's hope you can tell me.

This what i do (complete session at the bottom of this email)

- I have my main branch "main"
- I branch from it another one called "new-feature"
- I commit once in "main", once in "new-feature" (so both trees diverge)
- From "new-feature", i:
  - do a "bzr merge ../main" to get the last change in "main"
  - do a "bzr status" to see that change
  - do a "bzr commit -m 'Merged with main'" to merge with it

Now, if i make another "bzr merge ../main" and "bzr status" in
"new-feature", i guess i shouldn't see any change (everything has been
merged).

BUT i get i line saying:
"pending merges: ... (and the last commit from "main".

I i make another commit in "main" and i merge from "new-feature", that
first "always-appearing" pending merge disappears. But a new one
appears, with the last commit.

Is this the correct behavior?

If so, how do yo develop bzr itself? I mean, i guess Martin Pool
develops in his main branch  and sometimes merges from Robert. But if
issuing a merge command always changes something, how do you keep track
of changes?

Thanks a lot for your attention and your help!! (and for this nice
software!!)

-- M

Here is the complete session:
------------------------------------------
~/tmp$ mkdir main
~/tmp$ cd main/

~/tmp/main$ bzr init
~/tmp/main$ echo foo > test.txt
~/tmp/main$ bzr add test.txt
added test.txt
~/tmp/main$ bzr commit -m "First commit in main"
~/tmp/main$ cd ..

~/tmp$ bzr branch main/ new-feature
~/tmp$ cd new-feature/

~/tmp/new-feature$ echo foo >> test2.txt
~/tmp/new-feature$ bzr add test2.txt
added test2.txt
~/tmp/new-feature$ bzr commit -m "First commit in new-feature"
~/tmp/new-feature$ cd ../main/

~/tmp/main$ echo foo >> test.txt
~/tmp/main$ bzr commit -m "Second commit in main"
~/tmp/main$ cd ../new-feature/

~/tmp/new-feature$ bzr merge ../main
0 conflicts encountered.

~/tmp/new-feature$ bzr status
modified:
  test.txt
pending merges:
  Matiyam 2005-10-18 Second commit in main
~/tmp/new-feature$ bzr commit -m "Merged with main"


~/tmp/new-feature$ bzr merge ../main
0 conflicts encountered.

~/tmp/new-feature$ bzr status
pending merges:
  Matiyam 2005-10-18 Second commit in main

~/tmp/new-features$ bzr commit -m "Again merged with main"

~/tmp/new-feature$ bzr merge ../main
0 conflicts encountered.

~/tmp/new-feature$ bzr status
pending merges:
  Matiyam 2005-10-18 Second commit in main
-----------------------------------------------