/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

From Revision 1534.7.93 to 1534.7.74

expand all expand all

Rev   Summary Authors Date Diff Files
1534.7.93
Added text merge test
Aaron Bentley 19 years ago Diff Files
1534.7.92
Handle non-file bases
Aaron Bentley 20 years ago Diff Files
1534.7.91
Merged the latest from bzr.ab
Aaron Bentley 20 years ago Diff Files
1534.7.90
fixed undefined trans_id
Aaron Bentley 20 years ago Diff Files
1534.7.89
Handle all content types in three-way
Aaron Bentley 20 years ago Diff Files
1534.7.88
Defer determining trans_id until we need it, because each tr...
Aaron Bentley 20 years ago Diff Files
1534.7.87
Don't set executability on non-files
Aaron Bentley 20 years ago Diff Files
1534.7.86
Reverted partial change
Aaron Bentley 20 years ago Diff Files
1534.7.85
Handled merging the execute bit
Aaron Bentley 20 years ago Diff Files
1534.7.84
Added reprocess support, support for varying merge types
Aaron Bentley 20 years ago Diff Files
1534.7.83
differentiated between this tree(input) and working tree(out...
Aaron Bentley 20 years ago Diff Files
1534.7.82
Reported text conflicts programatically
Aaron Bentley 20 years ago Diff Files
1534.7.81
Merged the merge_internals_private change
Aaron Bentley 20 years ago Diff Files
1534.7.80
Stopped setting executability on conflict files
Aaron Bentley 20 years ago Diff Files
1534.7.79
Stopped calling get_file_lines on WorkingTree
Aaron Bentley 20 years ago Diff Files
1534.7.78
Used Merge3Merger in do_merge
Aaron Bentley 20 years ago Diff Files
1534.7.77
Got merge functionality starting to work
Aaron Bentley 20 years ago Diff Files
1534.7.76
Fixed final_parent, for the case where finding a parent adds...
Aaron Bentley 20 years ago Diff Files
1534.7.75
Added reverse-lookup for versioned files and get_trans_id
Aaron Bentley 20 years ago Diff Files
1534.7.74
Started on TreeTransform merge
Aaron Bentley 20 years ago Diff Files