← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 1534.7.158 to 1534.7.139

expand all expand all

Rev   Summary Authors Date Diff Files
1534.7.158
Merged John Meinel's integration
Aaron Bentley 18 years ago Diff Files
1534.7.157
Added more docs
Aaron Bentley 18 years ago Diff Files
1534.7.156
PEP8 fixes
Aaron Bentley 18 years ago Diff Files
1534.7.155
Removed changes from bzr.ab 1526..1528
Aaron Bentley 18 years ago Diff Files
1534.7.154
Removed changes from bzr.ab 1529..1536
Aaron Bentley 18 years ago Diff Files
1534.7.153
Handled test cases involving symlinks
Aaron Bentley 18 years ago Diff Files
1534.7.152
Fixed overwrites
Aaron Bentley 18 years ago Diff Files
1534.7.151
Fixed all changes applied successfully
Aaron Bentley 18 years ago Diff Files
1534.7.150
Handled simultaneous renames of parent and child better
Aaron Bentley 18 years ago Diff Files
1534.7.149
Removed bare except
Aaron Bentley 18 years ago 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