~bzr-pqm/bzr/bzr.dev : changes

~bzr-pqm/bzr/bzr.dev » Changes from revision 3948.1.7

From Revision 3948.1.7 to 3936

Rev	Summary	Authors	Date
3948.1.7	Slight refactoring and test fixing. Slight refactoring and test fixing. * bzrlib/tests/test_merge.py: (TestMergerEntriesLCAOnDisk.test_modified_symlink): Passing now. * bzrlib/merge.py: (Merge3Merger._lca_multi_way): Fix doc reference. (Merge3Merger.merge_contents.contents_conflict): Try to delay this_pair evaulation to avoid unnecessary sha1 (impyling file read from disk) calculation. Also slightly refactor to avoid repeated file_id in trees calculations.	Vincent Ladeuil	15 years ago
3948.1.6	Remerge jam fix and its ancestry Remerge jam fix and its ancestry	Vincent Ladeuil	15 years ago
3948.1.5	merge jam fix merge jam fix	Vincent Ladeuil	15 years ago
3948.1.4	More cleanup and fix overzealous previous one. More cleanup and fix overzealous previous one. * bzrlib/tests/test_merge.py: (TestMergerEntriesLCA.test_file_not_in_one_lca, TestMergerEntriesLCA.test_only_in_one_lca, TestMergerEntriesLCA.test_same_lca_resolution_one_side_updates_content, TestMergerEntriesLCA.test_this_changed_kind): Delete useless vars. (TestMergerEntriesLCA.test_not_in_other_mod_in_lca1_not_in_lca2): But not there !.	Vincent Ladeuil	15 years ago
3948.1.3	Cleanup. Cleanup. * bzrlib/tests/test_merge.py: (TestMergerEntriesLCA.test_not_in_other_or_lca, TestMergerEntriesLCA.test_not_in_other_mod_in_lca1_not_in_lca2): Delete useless vars.	Vincent Ladeuil	15 years ago
3948.1.2	* bzrlib/merge.py: * bzrlib/merge.py: (Merger.find_base): Add some mutter calls to help debug.	Vincent Ladeuil	16 years ago
3948.1.1	Fix an edge case with deleted files and criss-cross merges. Fix an edge case with deleted files and criss-cross merges. We wanted to be careful that if you had a criss-cross merge and both sides resolved the conflict in a different way, that you got a conflict. However, the original test was actually testing when one LCA dominated the other, which is a case where we shouldn't conflict. Test cases updated appropriately.	John Arbash Meinel	16 years ago
3948	Correct incorrect wording in revisionspec help (Matthew Full... Correct incorrect wording in revisionspec help (Matthew Fuller)	Canonical.com Patch ...	16 years ago
3947	Multi-glob rules (Marius Kruger) Multi-glob rules (Marius Kruger)	Canonical.com Patch ...	16 years ago
3946	(mbp) Fix strange default parameter to _sftp_readv (mbp) Fix strange default parameter to _sftp_readv	Canonical.com Patch ...	16 years ago
3945	(mbp) small refactorings of upgrade (mbp) small refactorings of upgrade	Canonical.com Patch ...	16 years ago
3944	apply jam's log --short fix (Ian Clatworthy) apply jam's log --short fix (Ian Clatworthy)	Canonical.com Patch ...	16 years ago
3943	Fix log --short/--line FILE (Ian Clatworthy, #317417) Fix log --short/--line FILE (Ian Clatworthy, #317417)	Canonical.com Patch ...	16 years ago
3942	(vila) Allows deltas to be filtered by log formatters (vila) Allows deltas to be filtered by log formatters	Canonical.com Patch ...	16 years ago
3941	(mbp) reorder things into the right part of NEWS (mbp) reorder things into the right part of NEWS	Canonical.com Patch ...	16 years ago
3940	(mbp) transport-based progress bars (mbp) transport-based progress bars	Canonical.com Patch ...	16 years ago
3939	init prints more concise information init prints more concise information	Canonical.com Patch ...	16 years ago
3938	Better/faster status after merge (Ian Clatworthy) Better/faster status after merge (Ian Clatworthy)	Canonical.com Patch ...	16 years ago
3937	(mbp) merge 1.11 and advance to 1.12 (mbp) merge 1.11 and advance to 1.12	Canonical.com Patch ...	16 years ago
3936	(jam) Update build-release for the 0.11rc1 release. (jam) Update build-release for the 0.11rc1 release.	Canonical.com Patch ...	16 years ago

Older »