← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 974.1.22 to 974.1.3

expand all expand all

Rev   Summary Authors Date Diff Files
974.1.22
Refactored code
Aaron Bentley 19 years ago Diff Files
974.1.21
Handled path generation properly
aaron.bentley at uto... 19 years ago Diff Files
974.1.20
Eliminated ThreeWayInventory
Aaron Bentley 19 years ago Diff Files
974.1.19
Removed MergeTree.inventory
Aaron Bentley 19 years ago Diff Files
974.1.18
Stopped using SourceFile in inventory
Aaron Bentley 19 years ago Diff Files
974.1.17
Switched to using a set of interesting file_ids instead of S...
Aaron Bentley 19 years ago Diff Files
974.1.16
Ensured that revert FILE only modifies that file.
Aaron Bentley 19 years ago Diff Files
974.1.15
Removed use of patch and diff in merge, removed patch.diff
aaron.bentley at uto... 19 years ago Diff Files
974.1.14
Fixed bugs in merge optimization
aaron.bentley at uto... 19 years ago Diff Files
974.1.13
Avoid rewriting inventory when not necessary
aaron.bentley at uto... 19 years ago Diff Files
974.1.12
Switched from text-id to hashcache for merge optimization
aaron.bentley at uto... 19 years ago Diff Files
974.1.11
replaced revert with merge-revert
aaron.bentley at uto... 19 years ago Diff Files
974.1.10
Added file-selection to merge-revert
aaron.bentley at uto... 19 years ago Diff Files
974.1.9
Added merge-type parameter to merge.
Aaron Bentley 19 years ago Diff Files
974.1.8
Added default backups for merge-revert
Aaron Bentley 19 years ago Diff Files
974.1.7
Fixed handling of merge factory in test suite
Aaron Bentley 19 years ago Diff Files
974.1.6
Added unit tests
Aaron Bentley 19 years ago Diff Files
974.1.5
Fixed handling of missing newlines in udiffs
Aaron Bentley 19 years ago Diff Files
974.1.4
Implemented merge3 as the default text merge
Aaron Bentley 19 years ago Diff Files
974.1.3
Added merge_factory parameter to merge_flex
Aaron Bentley 19 years ago Diff Files