← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 1534.10.4 to 1534.7.184

expand all expand all

Rev   Summary Authors Date Diff Files
1534.10.4
Implemented conflict serialization
Aaron Bentley 18 years ago Diff Files
1534.10.3
Simplify set_merge_modified with rio_file
Aaron Bentley 18 years ago Diff Files
1534.10.2
Implemented rio_file to produce a light file object from sta...
Aaron Bentley 18 years ago Diff Files
1534.10.1
Merge from bzr.ab.integration
Aaron Bentley 18 years ago Diff Files
1534.7.199
Moved merge/revert tests into test_workingtree.py
Aaron Bentley 18 years ago Diff Files
1534.7.198
Removed spurious encode/decode
Aaron Bentley 18 years ago Diff Files
1534.7.197
Removed splatfile format
Aaron Bentley 18 years ago Diff Files
1534.7.196
Switched to Rio format for merge-modified list
Aaron Bentley 18 years ago Diff Files
1534.7.195
Cleanups
Aaron Bentley 18 years ago Diff Files
1534.7.194
Added test case for file not added by merge
Aaron Bentley 18 years ago Diff Files
1534.7.193
Stopped revert from preserving file contents produced by mer...
Aaron Bentley 18 years ago 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