← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 1534.7.98 to 1534.7.79

expand all expand all

Rev   Summary Authors Date Diff Files
1534.7.98
Refactored conflict handling to generic function
Aaron Bentley 18 years ago Diff Files
1534.7.97
Ensured foo.BASE is a directory if there's a conflict
Aaron Bentley 18 years ago Diff Files
1534.7.96
Tested with BASE as directory
Aaron Bentley 18 years ago Diff Files
1534.7.95
Added more text merge tests
Aaron Bentley 18 years ago Diff Files
1534.7.94
Merge from bzr.ab
Aaron Bentley 18 years ago Diff Files
1534.7.93
Added text merge test
Aaron Bentley 18 years ago Diff Files
1534.7.92
Handle non-file bases
Aaron Bentley 18 years ago Diff Files
1534.7.91
Merged the latest from bzr.ab
Aaron Bentley 18 years ago Diff Files
1534.7.90
fixed undefined trans_id
Aaron Bentley 18 years ago Diff Files
1534.7.89
Handle all content types in three-way
Aaron Bentley 18 years ago Diff Files
1534.7.88
Defer determining trans_id until we need it, because each tr...
Aaron Bentley 18 years ago Diff Files
1534.7.87
Don't set executability on non-files
Aaron Bentley 18 years ago Diff Files
1534.7.86
Reverted partial change
Aaron Bentley 18 years ago Diff Files
1534.7.85
Handled merging the execute bit
Aaron Bentley 18 years ago Diff Files
1534.7.84
Added reprocess support, support for varying merge types
Aaron Bentley 18 years ago Diff Files
1534.7.83
differentiated between this tree(input) and working tree(out...
Aaron Bentley 18 years ago Diff Files
1534.7.82
Reported text conflicts programatically
Aaron Bentley 18 years ago Diff Files
1534.7.81
Merged the merge_internals_private change
Aaron Bentley 18 years ago Diff Files
1534.7.80
Stopped setting executability on conflict files
Aaron Bentley 18 years ago Diff Files
1534.7.79
Stopped calling get_file_lines on WorkingTree
Aaron Bentley 18 years ago Diff Files