[BUG] bzr: ERROR: exceptions.AttributeError: 'tuple' object has no attribute 'working_tree'
Jean-François Veillette
jean_francois_veillette at yahoo.ca
Thu Oct 26 19:58:56 BST 2006
14:56:39: bzr commit -m "Merge avec le tronc"
bzr: ERROR: Conflicts detected in working tree. Use "bzr conflicts"
to list, "bzr resolve FILE" to resolve.
14:56:56: bzr conflicts
bzr: ERROR: exceptions.AttributeError: 'tuple' object has no
attribute 'working_tree'
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/plugins/conflicts.py", line 31, in run
for path in Branch.open_containing('.').working_tree
().iter_conflicts():
AttributeError: 'tuple' object has no attribute 'working_tree'
bzr 0.11.0 on python 2.4.2.final.0 (darwin)
arguments: ['/usr/local/bin/bzr', 'conflicts']
** please send this report to bazaar-ng at lists.ubuntu.com
14:57:05: bzr st ; bzr info ; bzr version
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
conflicts:
Text conflict in AFaire.txt
pending merges:
Jean-François Vei... 2006-10-26 - Merge du correctif nécessaire
pour l'utilisation d'accents comme critère de recherche.
Jean-François Vei... 2006-10-26 Caprices XCode
Jean-François Vei... 2006-10-26 Prise en note des éléments à
travailler, suite à la rencontre avec Line Bachand.
Jean-François Vei... 2006-10-26 - Corrige le problème relié à
l'utilisation de caractère accentué pour critère de recherche.
Location:
branch root: file:///Users/jfv/Developement/BiblioChamplain/
branchesTamia2/Securite/
Related branches:
parent branch: file:///Users/jfv/Developement/BiblioChamplain/Tamia2/
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
0 ignored
109 versioned subdirectories
Branch history:
110 revisions
384 days old
first revision: Thu 2005-10-06 21:41:00 -0400
latest revision: Wed 2006-10-11 00:42:36 -0400
Revision store:
116 revisions
4684 KiB
Bazaar (bzr) 0.11.0
Using python interpreter: /usr/bin/python
Using python standard library: /System/Library/Frameworks/
Python.framework/Versions/2.4/lib/python2.4
Using bzrlib: /System/Library/Frameworks/Python.framework/Versions/
2.4/lib/python2.4/site-packages/bzrlib
Copyright 2005, 2006 Canonical Development Ltd.
http://bazaar-vcs.org/
bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
you may use, modify and redistribute it under the terms of the GNU
General Public License version 2 or later.
14:58:34:
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
More information about the bazaar
mailing list