Can't merge a directory deletion in a wt with a pending subdirectory deletion
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
High
|
Unassigned |
Bug Description
All of the clients were running version 1.10. repository server is Ubuntu Linux also was running 1.10. Development Clients are Windows XP and server 2003.
I have about 14 active repositories of various sizes for a project. They're all pretty simple structures with no branching.
The repositories were all OK. Now moved today to version 2.2.0 on both client and server
Whilst updating one copy of the repository on a client I got an error. All others were OK.
This particular repository contains large binary files where we store 3rd party sources for installing.
I've searched the bug database and can't find this one.
Text of the bzr update is:
Connected (version 2.0, client OpenSSH_4.7p1)
Authentication (publickey) successful!
Secsh channel 1 opened.
{Preparing for file merge x/1091}
{pass X flashes up and disappears}
bzr: ERROR: Tree transform is malformed [('unversioned parent', 'new-141'), ('versioning no contents', 'new-162')]
bzr check on the client gives NO errors on the local (outdated) repository
C:\nms\xxxx\bin>bzr check
Checking working tree at 'C:/nms/xxxx/bin'.
Checking branch at 'file:/
Checking repository at 'file:/
checked repository file://
2 revisions
1090 file-ids
checked branch file://
C:\nms\xxxx\bin>
Checking the repository on the server also gives 0 errors. NB the bzr repository server has NO working tree: it is purely a repository.
bzr@xxxx01:
Checking branch at 'file:/
No working tree found at specified location.
Checking repository at 'file:/
checked repository file://
2 revisions
1090 file-ids
checked branch file://
bzr@globis01:
Any advice???
It would be possible to recreate this repository from scratch but it doesn't build confidence in the development team.
bzr status lists a whole load of files that need updating {I can attach this if it helps}
They are indeed files that were updated on another client and commited to the repository (with 0 errors)
Just found the traceback log file. You'll want this too obviously.
Tue 2010-09-07 23:05:56 +0200 Administrator/ Application Data/bazaar/ 2.0/plugins plugins \Administrator/ .ssh/known_ hosts' 4B37D01EE756888 9F y(bzr+ssh: //<email address hidden> :1022// /home/bzr/ gnms-xxxx- bin/.bzr/ )(RemoteReposit oryFormat( _network_ name='Bazaar pack repository format 1 (needs bzr 0.92)\n')) and KnitPackReposit ory('file: ///C:/nms/ xxxx/bin/ .bzr/repository /')(RepositoryF ormatKnitPack1( )) nlvhtcsemims119 -20100901110637 -5oxlpt60ew8bp9 g0} commands. pyo", line 911, in exception_ to_return_ code commands. pyo", line 1111, in run_bzr commands. pyo", line 689, in run_argv_aliases commands. pyo", line 704, in run cleanup. pyo", line 135, in run_simple cleanup. pyo", line 165, in _do_with_cleanups builtins. pyo", line 1440, in run workingtree. pyo", line 2257, in update mutabletree. pyo", line 49, in tree_write_locked workingtree. pyo", line 2325, in _update_tree cleanup. pyo", line 135, in run_simple cleanup. pyo", line 165, in _do_with_cleanups cleanup. pyo", line 131, in run cleanup. pyo", line 165, in _do_with_cleanups computing_ transform transform. pyo", line 2805, in resolve_conflicts
0.140 bazaar version: 2.2.0
0.140 bzr arguments: [u'update']
0.156 looking for plugins in C:/Documents and Settings/
0.156 looking for plugins in C:/Program Files/Bazaar/
0.359 encoding stdout as sys.stdout encoding 'cp437'
0.390 opening working tree 'C:/nms/xxxx/bin'
0.500 bzr-svn: using Subversion 1.6.6 ()
0.687 falling back to default implementation
0.687 failed to load system host keys: [Errno 2] No such file or directory: 'C:\\Documents and Settings\
[ 5300] 2010-09-07 23:05:57.249 INFO: Connected (version 2.0, client OpenSSH_4.7p1)
1.031 Trying SSH agent key AEE90FEE030A2B0
[ 5300] 2010-09-07 23:05:57.624 INFO: Authentication (publickey) successful!
[ 5300] 2010-09-07 23:05:57.687 INFO: Secsh channel 1 opened.
2.171 Using fetch logic to copy between RemoteRepositor
2.171 fetch up to rev {commissioning@
70.625 Traceback (most recent call last):
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\merge.pyo", line 1968, in merge_inner
File "bzrlib\merge.pyo", line 704, in do_merge
File "bzrlib\
File "bzrlib\
File "bzrlib\merge.pyo", line 675, in _do_merge_to
File "bzrlib\merge.pyo", line 814, in do_merge
File "bzrlib\
File "bzrlib\
File "bzrlib\merge.pyo", line 819, in _do_merge
File "bzrlib\merge.pyo", line 865, in _compute_transform
File "bzrlib\merge.pyo", line 875, in _finish_
File "bzrlib\
MalformedTransform: Tree transform is malformed [('unversioned parent', 'new-141'), ('versioning no contents', 'new-162')]
70.625 Transferred: 4kB (0.1kB/s r:2kB w:2kB)
70.625 return code 3