← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 1534.7.142 to 1534.7.123

expand all expand all

Rev   Summary Authors Date Diff Files
1534.7.142
Fixed executability conflicts
Aaron Bentley 19 years ago Diff Files
1534.7.141
Added conflict reporting
Aaron Bentley 19 years ago Diff Files
1534.7.140
Moved the merge stuff into merge.py
Aaron Bentley 19 years ago Diff Files
1534.7.139
ApplyMerge3 -> Merge3Merger
Aaron Bentley 19 years ago Diff Files
1534.7.138
Removed unused method
Aaron Bentley 19 years ago Diff Files
1534.7.137
Avoided generating a new tree for every weave merge
Aaron Bentley 19 years ago Diff Files
1534.7.136
Got WeaveMerger under test
Aaron Bentley 19 years ago Diff Files
1534.7.135
Fixed deletion handling
Aaron Bentley 19 years ago Diff Files
1534.7.134
Hid raw conflicts
Aaron Bentley 19 years ago Diff Files
1534.7.133
Strengthened conflict tests
Aaron Bentley 19 years ago Diff Files
1534.7.132
Got cooked conflicts working
Aaron Bentley 19 years ago Diff Files
1534.7.131
Work on cooked conflicts
Aaron Bentley 19 years ago Diff Files
1534.7.130
More conflict handling, test porting
Aaron Bentley 19 years ago Diff Files
1534.7.129
Converted test cases to Tree Transform
Aaron Bentley 19 years ago Diff Files
1534.7.128
Got missing contents test working
Aaron Bentley 19 years ago Diff Files
1534.7.127
Merge from bzr.ab
Aaron Bentley 19 years ago Diff Files
1534.7.126
Fixed executability merge bug
Aaron Bentley 19 years ago Diff Files
1534.7.125
Fixed executability merge bug
Aaron Bentley 19 years ago Diff Files
1534.7.124
Fixed merge_core bug
Aaron Bentley 19 years ago Diff Files
1534.7.123
Fixed handling of unversioned files
Aaron Bentley 19 years ago Diff Files