← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 1534.7.148 to 1534.7.129

expand all expand all

Rev   Summary Authors Date Diff Files
1534.7.148
Handled the remaining file versioning case
Aaron Bentley 18 years ago Diff Files
1534.7.147
Tweak to check inventory, not tree for file ids
Aaron Bentley 18 years ago Diff Files
1534.7.146
Fixed merge so tree root is auto-preserved, not by conflict ...
Aaron Bentley 18 years ago Diff Files
1534.7.145
More fixups after get_trans_id
Aaron Bentley 18 years ago Diff Files
1534.7.144
Worked on fixing trans_id stuff
Aaron Bentley 18 years ago Diff Files
1534.7.143
Prevented get_trans_id from automatically versioning file id...
Aaron Bentley 18 years ago Diff Files
1534.7.142
Fixed executability conflicts
Aaron Bentley 18 years ago Diff Files
1534.7.141
Added conflict reporting
Aaron Bentley 18 years ago Diff Files
1534.7.140
Moved the merge stuff into merge.py
Aaron Bentley 18 years ago Diff Files
1534.7.139
ApplyMerge3 -> Merge3Merger
Aaron Bentley 18 years ago Diff Files
1534.7.138
Removed unused method
Aaron Bentley 18 years ago Diff Files
1534.7.137
Avoided generating a new tree for every weave merge
Aaron Bentley 18 years ago Diff Files
1534.7.136
Got WeaveMerger under test
Aaron Bentley 18 years ago Diff Files
1534.7.135
Fixed deletion handling
Aaron Bentley 18 years ago Diff Files
1534.7.134
Hid raw conflicts
Aaron Bentley 18 years ago Diff Files
1534.7.133
Strengthened conflict tests
Aaron Bentley 18 years ago Diff Files
1534.7.132
Got cooked conflicts working
Aaron Bentley 18 years ago Diff Files
1534.7.131
Work on cooked conflicts
Aaron Bentley 18 years ago Diff Files
1534.7.130
More conflict handling, test porting
Aaron Bentley 18 years ago Diff Files
1534.7.129
Converted test cases to Tree Transform
Aaron Bentley 18 years ago Diff Files