/brz/remove-bazaar

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

From Revision 1534.8.3 to 1534.7.94

expand all expand all

Rev   Summary Authors Date Diff Files
1534.8.3
Added Diff3 merging for tree transforms
Aaron Bentley 19 years ago Diff Files
1534.8.2
Implemented weave merge
Aaron Bentley 19 years ago Diff Files
1534.8.1
Reference files in limbo before their creation is finished, ...
Aaron Bentley 19 years ago Diff Files
1534.7.110
Handled three-way with deletions better
Aaron Bentley 19 years ago Diff Files
1534.7.109
Fixed executability test, so it works with EmptyTree
Aaron Bentley 19 years ago Diff Files
1534.7.108
Fixed executability handling
Aaron Bentley 19 years ago Diff Files
1534.7.107
Implemented show-base
Aaron Bentley 19 years ago Diff Files
1534.7.106
Cleaned up imports, added copyright statements
Aaron Bentley 19 years ago Diff Files
1534.7.105
Got merge with rename working
Aaron Bentley 19 years ago Diff Files
1534.7.104
Fixed set_versioned, enhanced conflict testing
Aaron Bentley 20 years ago Diff Files
1534.7.103
Deleted old pre-conflict contents
Aaron Bentley 20 years ago Diff Files
1534.7.102
Deleted old pre-conflict contents
Aaron Bentley 20 years ago Diff Files
1534.7.101
Got conflicts on symlinks working properly
Aaron Bentley 20 years ago Diff Files
1534.7.100
Fixed path-relative test cases
Aaron Bentley 20 years ago Diff Files
1534.7.99
Handle non-existent BASE properly
Aaron Bentley 20 years ago Diff Files
1534.7.98
Refactored conflict handling to generic function
Aaron Bentley 20 years ago Diff Files
1534.7.97
Ensured foo.BASE is a directory if there's a conflict
Aaron Bentley 20 years ago Diff Files
1534.7.96
Tested with BASE as directory
Aaron Bentley 20 years ago Diff Files
1534.7.95
Added more text merge tests
Aaron Bentley 20 years ago Diff Files
1534.7.94
Merge from bzr.ab
Aaron Bentley 20 years ago Diff Files