Activity log for bug #424781

Date Who What changed Old value New value Message
2009-09-05 11:18:46 Justyn Butler bug added bug
2009-09-05 11:27:27 Justyn Butler summary Merge into PreviewTree leaves only a single entry in tree Merge into PreviewTree lists only a single entry with list_files
2009-09-05 11:28:55 Justyn Butler description Working with test_merge_into_preview in test_transform.py as a reference (bzr 1.17). This makes it easier to explain. This test merges a Working Tree into a PreviewTree. If the test is modified so that the work_tree has multiple files created at the beginning then the resulting "final_tree" contains only a single entry (checked via list_files), and it seems to be the first entry added - regardless of what modifications are made to the Preview Tree prior to merging. Working with test_merge_into_preview in test_transform.py as a reference (bzr 1.17). This makes it easier to explain. This test merges a Working Tree into a PreviewTree. If the test is modified so that the work_tree has multiple files created at the beginning then the resulting "final_tree" contains only a single entry when checked via list_files, and it seems to be the first entry added - regardless of what modifications are made to the Preview Tree prior to merging. UPDATE: Actually retrieving the file contents from the final_tree works so I think the tree is being created correctly? Perhaps only listing the files causes the problem.
2009-09-05 11:30:17 Justyn Butler description Working with test_merge_into_preview in test_transform.py as a reference (bzr 1.17). This makes it easier to explain. This test merges a Working Tree into a PreviewTree. If the test is modified so that the work_tree has multiple files created at the beginning then the resulting "final_tree" contains only a single entry when checked via list_files, and it seems to be the first entry added - regardless of what modifications are made to the Preview Tree prior to merging. UPDATE: Actually retrieving the file contents from the final_tree works so I think the tree is being created correctly? Perhaps only listing the files causes the problem. Working with test_merge_into_preview in test_transform.py as a reference (bzr 1.17). This makes it easier to explain. This test merges a Working Tree into a PreviewTree. If the test is modified so that the work_tree has multiple files created at the beginning then the resulting "final_tree" contains only a single entry when checked via list_files, and it seems to be the first entry added - regardless of what modifications are made to the Preview Tree prior to merging. UPDATE: Actually retrieving multiple file contents from the final_tree works so I think the tree is being created correctly. Perhaps it is only listing the entries that does not work.
2010-03-17 03:37:50 Martin Pool tags merge test
2010-03-17 03:37:55 Martin Pool bzr: importance Undecided Low
2010-03-17 03:37:55 Martin Pool bzr: status New Confirmed
2012-03-12 13:23:36 Vincent Ladeuil tags merge test merge selftest
2012-03-12 13:33:07 Justyn Butler removed subscriber Justyn Butler
2017-11-09 00:34:11 Jelmer Vernooij tags merge selftest check-for-breezy merge selftest