Possible bug while using bzr 0.12.0

[Erik Bågfors]

The error message is bad, but, the reason is that you tried something like this

bzr merge [otherbranch]
bzr commit filname

When you do a merge from another branch, you have to commit the entire
merge, not just parts of it (as you would with "bzr commit filename").

Also, see "bzr status" for a clear view of what revisions you are
merging and which files changed.

/Erik


On 11/10/06, Mariano Mara <mmara at fibertel.com.ar> wrote:
> Hi there,
> Installed bzr 0.12.0 from source in my centos 4 64 bits server and in my
> ubutu 6.06 desktop too.
> I created a branch in the server and added 3 flat files with some text.
> I pulled a copy to my desktop and start playing around. After making
> some changes here and there I modified one of the server files, commited
> and updated it and then made a merge in my desktop. I modified the same
> file in my branch and when trying to commit it (I used vim to add the
> commit message) here is what I got:
> **************************
> mariano at mishima:~/sourcecode/bzrtest$ bzr commit archivo1.txt
> bzr: ERROR: exceptions.NotImplementedError: ('selected-file commit of
> merges is not supported yet: files %r', [u'archivo1.txt'])
>
> Traceback (most recent call last):
>   File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 623,
> in run_bzr_catch_errors
>     return run_bzr(argv)
>   File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 585,
> in run_bzr
>     ret = run(*run_argv)
>   File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 291,
> in run_argv_aliases
>     return self.run(**all_cmd_args)
>   File "/usr/lib/python2.4/site-packages/bzrlib/builtins.py", line 1808,
> in run
>     reporter=reporter)
>   File "/usr/lib/python2.4/site-packages/bzrlib/decorators.py", line 51,
> in write_locked
>     return unbound(self, *args, **kwargs)
>   File "/usr/lib/python2.4/site-packages/bzrlib/mutabletree.py", line
> 126, in commit
>     revprops=revprops, *args, **kwargs)
>   File "/usr/lib/python2.4/site-packages/bzrlib/commit.py", line 301, in
> commit
>     self.specific_files)
> NotImplementedError: ('selected-file commit of merges is not supported
> yet: files %r', [u'archivo1.txt'])
>
> bzr 0.12.0 on python 2.4.3.final.0 (linux2)
> arguments: ['/usr/bin/bzr', 'commit', 'archivo1.txt']
>
> ** please send this report to bazaar-ng at lists.ubuntu.com
>
> Please consider that I'm just trying to learn it and maybe my
> modifications are random and would make no sense in the real world use
> of bzr.
>
> Hope this helps.
> **************************
>
>
>


-- 
google talk/jabber. zindar at gmail.com
SIP-phones: sip:erik_bagfors at gizmoproject.com
sip:17476714687 at proxy01.sipphone.com