bzr merge broken?

[Valentino Volonghi aka Dialtone]

Hi all, from a first try with bzr I tried branching locally and then merging
back after 2 commits. This unfortunately failed because of some error in the
command handling in bzr. I'm using latest bzr.dev

dialtone at aiolia /Volumes/dati/Sviluppo/foo$ ls
dialtone at aiolia /Volumes/dati/Sviluppo/foo$ touch ciao.c
dialtone at aiolia /Volumes/dati/Sviluppo/foo$ bzr init
dialtone at aiolia /Volumes/dati/Sviluppo/foo$ bzr add ciao.c=20
added ciao.c
dialtone at aiolia /Volumes/dati/Sviluppo/foo$ bzr commit -m "init"
dialtone at aiolia /Volumes/dati/Sviluppo/foo$ cd ..
dialtone at aiolia /Volumes/dati/Sviluppo$ bzr branch foo foo-branch
dialtone at aiolia /Volumes/dati/Sviluppo$ cd foo-branch/
dialtone at aiolia /Volumes/dati/Sviluppo/foo-branch$ ls
ciao.c
dialtone at aiolia /Volumes/dati/Sviluppo/foo-branch$ touch fogaz.c
dialtone at aiolia /Volumes/dati/Sviluppo/foo-branch$ bzr add fogaz.c=20
added fogaz.c
dialtone at aiolia /Volumes/dati/Sviluppo/foo-branch$ vim ciao.c=20
[edit edit edit]

dialtone at aiolia /Volumes/dati/Sviluppo/foo-branch$ bzr commit -m "urgh"
dialtone at aiolia /Volumes/dati/Sviluppo/foo-branch$ ls
ciao.c  fogaz.c
dialtone at aiolia /Volumes/dati/Sviluppo/foo-branch$ touch app.c
dialtone at aiolia /Volumes/dati/Sviluppo/foo-branch$ bzr add app.c=20
added app.c
dialtone at aiolia /Volumes/dati/Sviluppo/foo-branch$ bzr ci -m "forz"
dialtone at aiolia /Volumes/dati/Sviluppo/foo-branch$ ls             =20
app.c   ciao.c  fogaz.c
dialtone at aiolia /Volumes/dati/Sviluppo/foo-branch$ cd ..
dialtone at aiolia /Volumes/dati/Sviluppo$ cd foo
dialtone at aiolia /Volumes/dati/Sviluppo/foo$ bzr merge ../foo-branch/ -r2=20
bzr: ERROR: 'unicode' object has no attribute 'revision_history'
command: '/usr/bin/bzr' 'merge' '../foo-branch/' '-r2'
pwd: /Volumes/dati/Sviluppo/foo
at /Volumes/dati/Sviluppo/bzr.dev/bzrlib/revisionspec.py line 151, in in_hi=
story()
see ~/.bzr.log for debug information
dialtone at aiolia /Volumes/dati/Sviluppo/foo$ cat ~/bzr.log
...
...

[ 9254] Wed 16:57:44.919 ERROR: 'unicode' object has no attribute
'revision_history'
  command: '/usr/bin/bzr' 'merge' '../foo-branch/' '-r2'
  pwd: /Volumes/dati/Sviluppo/foo
Traceback (most recent call last):
  File "/Volumes/dati/Sviluppo/bzr.dev/bzrlib/commands.py", line 514, in
run_bzr_catch_errors
    return run_bzr(argv)
  File "/Volumes/dati/Sviluppo/bzr.dev/bzrlib/commands.py", line 499, in
run_bzr
    ret = cmd_obj.run_argv(argv)
  File "/Volumes/dati/Sviluppo/bzr.dev/bzrlib/commands.py", line 214, in
run_argv
    return self.run(**all_cmd_args)
  File "/Volumes/dati/Sviluppo/bzr.dev/bzrlib/builtins.py", line 1295, in run
    other = [branch, revision[0].in_history(branch).revno]
  File "/Volumes/dati/Sviluppo/bzr.dev/bzrlib/revisionspec.py", line 151, in
in_history
    revs = branch.revision_history()
AttributeError: 'unicode' object has no attribute 'revision_history'

-- 
Valentino Volonghi aka Dialtone
Now Running MacOSX 10.4
Blog: http://vvolonghi.blogspot.com
http://weever.berlios.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 186 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051019/0a2828e0/attachment.pgp