← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 1534.7.183 to 1534.7.164

expand all expand all

Rev   Summary Authors Date Diff Files
1534.7.183
Fixed build_tree with symlinks
Aaron Bentley 18 years ago Diff Files
1534.7.182
Removed the remains of the old merge code
Aaron Bentley 18 years ago Diff Files
1534.7.181
Renamed a bunch of functions
Aaron Bentley 18 years ago Diff Files
1534.7.180
Merge from mainline
Aaron Bentley 18 years ago Diff Files
1534.7.179
Added Transform docs
Aaron Bentley 18 years ago Diff Files
1534.7.178
Fixed dangling inventory ids in revert
Aaron Bentley 18 years ago Diff Files
1534.7.177
Merge Robert (who merged John)
Aaron Bentley 18 years ago Diff Files
1534.7.176
Fixed up tests for Windows
abentley 18 years ago Diff Files
1534.7.175
Ensured revert writes a normal inventory
Aaron Bentley 18 years ago Diff Files
1534.7.174
Updated NEWS re Tree Transform
Aaron Bentley 18 years ago Diff Files
1534.7.173
Added conflict warnings to revert
Aaron Bentley 18 years ago Diff Files
1534.7.172
Integrated fs conflicts with merge conflicts.
Aaron Bentley 18 years ago Diff Files
1534.7.171
Implemented stringifying filesystem conflicts
Aaron Bentley 18 years ago Diff Files
1534.7.170
Cleaned up filesystem conflict handling
Aaron Bentley 18 years ago Diff Files
1534.7.169
Add filesystem/inventory conflicts to conflict output
Aaron Bentley 18 years ago Diff Files
1534.7.168
Removed unused function
Aaron Bentley 18 years ago Diff Files
1534.7.167
PEP8 and comment cleanups
Aaron Bentley 18 years ago Diff Files
1534.7.166
Swapped os.path.join for pathjoin everywhere
Aaron Bentley 18 years ago Diff Files
1534.7.165
Switched to build_tree instead of revert
Aaron Bentley 18 years ago Diff Files
1534.7.164
Updated test to new conflict message
Aaron Bentley 18 years ago Diff Files