← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 1534.7.192 to 1534.7.173

expand all expand all

Rev   Summary Authors Date Diff Files
1534.7.192
Record hashes produced by merges
Aaron Bentley 18 years ago Diff Files
1534.7.191
Got transform.apply to list modified paths
Aaron Bentley 18 years ago Diff Files
1534.7.190
Merge from bzr.ab.integration
Aaron Bentley 18 years ago Diff Files
1534.7.189
Got splatfile handling arbitrary number of values per stanza
Aaron Bentley 18 years ago Diff Files
1534.7.188
Changed name to splatfile, got tests passing
Aaron Bentley 18 years ago Diff Files
1534.7.187
Created yet another map file format
Aaron Bentley 18 years ago Diff Files
1534.7.186
Made weave conflict markers customizable, standardized defau...
Aaron Bentley 18 years ago Diff Files
1534.7.185
Merge from integration
Aaron Bentley 18 years ago Diff Files
1534.7.184
Merge from integration
Aaron Bentley 18 years ago 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