[BUG] selected-file commit of merges is not supported yet

[Jean-François Veillette]

14:05:06: bzr commit Tamia2.xcodeproj -m "Caprices XCode"
bzr: ERROR: exceptions.NotImplementedError: ('selected-file commit of  
merges is not supported yet: files %r', [u'Tamia2.xcodeproj'])

Traceback (most recent call last):
   File "/System/Library/Frameworks/Python.framework/Versions/2.4/lib/ 
python2.4/site-packages/bzrlib/commands.py", line 611, in  
run_bzr_catch_errors
     return run_bzr(argv)
   File "/System/Library/Frameworks/Python.framework/Versions/2.4/lib/ 
python2.4/site-packages/bzrlib/commands.py", line 573, in run_bzr
     ret = run(*run_argv)
   File "/System/Library/Frameworks/Python.framework/Versions/2.4/lib/ 
python2.4/site-packages/bzrlib/commands.py", line 282, in  
run_argv_aliases
     return self.run(**all_cmd_args)
   File "/System/Library/Frameworks/Python.framework/Versions/2.4/lib/ 
python2.4/site-packages/bzrlib/builtins.py", line 1798, in run
     reporter=reporter)
   File "/System/Library/Frameworks/Python.framework/Versions/2.4/lib/ 
python2.4/site-packages/bzrlib/decorators.py", line 51, in write_locked
     return unbound(self, *args, **kwargs)
   File "/System/Library/Frameworks/Python.framework/Versions/2.4/lib/ 
python2.4/site-packages/bzrlib/mutabletree.py", line 128, in commit
     revprops=revprops, *args, **kwargs)
   File "/System/Library/Frameworks/Python.framework/Versions/2.4/lib/ 
python2.4/site-packages/bzrlib/commit.py", line 299, in commit
     self.specific_files)
NotImplementedError: ('selected-file commit of merges is not  
supported yet: files %r', [u'Tamia2.xcodeproj'])

bzr 0.11.0 on python 2.4.2.final.0 (darwin)
arguments: ['/usr/local/bin/bzr', 'commit', 'Tamia2.xcodeproj', '-m',  
'Caprices XCode']

** please send this report to bazaar-ng at lists.ubuntu.com



Here is some more info :

14:08:53: bzr version-info
revision-id: jean.francois.veillette at gmail.com-20061026173210- 
d6881ed2f660e39d
date: 2006-10-26 13:32:10 -0400
build-date: 2006-10-26 14:09:21 -0400
revno: 111
branch-nick: Tamia2
14:09:22: bzr info
Location:
   branch root: file:///Users/jfv/Developement/BiblioChamplain/Tamia2/

Related branches:
   parent branch: file:///Users/jfv/Developement/BiblioChamplain/ 
Tamia2.2/

Format:
        control: Meta directory format 1
   working tree: Working tree format 3
         branch: Branch format 5
     repository: Knit repository format 1

In the working tree:
        706 unchanged
          5 modified
          3 added
          0 removed
          0 renamed
          0 unknown
         41 ignored
        109 versioned subdirectories

Branch history:
        111 revisions
        384 days old
    first revision: Thu 2005-10-06 21:41:00 -0400
   latest revision: Thu 2006-10-26 13:32:10 -0400

Revision store:
        119 revisions
       4790 KiB
14:10:42:

and some more ...
14:07:10: bzr st
added:
   .be/bugs/71540A56-67B5-11DA-A934-000A95AB9BA4/comments/ 
C327FEA0-8788-45C0-9E70-ABFEEB5E1FCE/
   .be/bugs/71540A56-67B5-11DA-A934-000A95AB9BA4/comments/ 
C327FEA0-8788-45C0-9E70-ABFEEB5E1FCE/body
   .be/bugs/71540A56-67B5-11DA-A934-000A95AB9BA4/comments/ 
C327FEA0-8788-45C0-9E70-ABFEEB5E1FCE/values
modified:
   .be/bugs/71540A56-67B5-11DA-A934-000A95AB9BA4/values
   AFaire.txt
   Sources/org/champlain/tamia/Recherche.java
   Tamia2.xcodeproj/jfv.mode1
   Tamia2.xcodeproj/jfv.pbxuser
pending merges:
   Jean-François Vei... 2006-10-26 - Corrige le problème relié à  
l'utilisation de caractère accentué pour critère de recherche.
14:08:53:

__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com