crash while retrying a merging from another branch
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Medium
|
Unassigned |
Bug Description
Merging a different branch of code into my current branch and I get a "text conflict in .bzrignore". I then tried the RETRY button and got this dump -
7376] 2010-09-02 14:44:16.438 INFO: -D test/VSH/
[ 7376] 2010-09-02 14:44:16.438 INFO: -D test/VSH/
[ 7376] 2010-09-02 14:44:16.438 WARNING: Text conflict in .bzrignore
[ 7376] 2010-09-02 14:44:22.562 INFO: 1 conflicts encountered.
60.171 Transferred: 0KiB (0.0K/s r:0K w:0K)
60.171 return code 1
[ 4356] 2010-09-02 14:48:22.655 INFO: Discarding watch for D:\Projects\
Thu 2010-09-02 14:49:50 -0400
0.187 bazaar version: 2.1.0
0.187 bzr arguments: [u'qsubprocess', u'--bencode', u'l5:merge53:
0.219 looking for plugins in D:/Documents and Settings/
0.219 looking for plugins in D:/Program Files/Bazaar/
0.453 encoding stdout as osutils.
0.531 bazaar version: 2.1.0
0.531 bzr arguments: [u'merge', u'T:/PROD_
0.547 encoding stdout as osutils.
0.609 opening working tree 'D:/Projects/
0.703 Using fetch logic to copy between CHKInventoryRep
0.703 fetch up to rev {<email address hidden>}
0.750 Base revid: 'e_deddy@
1.000 Traceback (most recent call last):
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "D:/Program Files/Bazaar/
File "D:/Program Files/Bazaar/
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\merge.pyo", line 658, in do_merge
File "bzrlib\
File "bzrlib\
File "bzrlib\merge.pyo", line 629, in _do_merge_to
File "bzrlib\merge.pyo", line 766, in do_merge
File "bzrlib\
File "bzrlib\
File "bzrlib\merge.pyo", line 772, in _do_merge
File "bzrlib\merge.pyo", line 814, in _compute_transform
File "bzrlib\merge.pyo", line 1316, in _do_merge_contents
File "bzrlib\merge.pyo", line 1482, in _dump_conflicts
File "bzrlib\merge.pyo", line 1495, in _conflict_file
File "bzrlib\
AssertionError: Unknown kind 'absent'
1.000 couldn't find apport bug-reporting library: No module named apport
1.015 Transferred: 0KiB (0.0K/s r:0K w:0K)
1.015 return code 4
Thu 2010-09-02 14:59:29 -0400
0.156 bazaar version: 2.1.0
0.156 bzr arguments: [u'--version']
0.219 encoding stdout as sys.stdout encoding 'cp437'
0.328 Transferred: 0KiB (0.0K/s r:0K w:0K)
0.328 return code 0
This looks like a bug in the transform code. I'm not sure about the specifics, but it is getting 'tree.kind(file_id) == 'absent'" and is very confused from there.
I don't think it is possible for RevisionTree.kind() to return 'absent', so I'm guessing the issue is that the source tree is another working tree (or possibly a _PreviewTree?)
However, all the code paths I can track down don't seem to be able to give 'absent'. I'm not really sure how to reproduce.