← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 1534.10.12 to 1534.7.192

expand all expand all

Rev   Summary Authors Date Diff Files
1534.10.12
Merge produces new conflicts
Aaron Bentley 18 years ago Diff Files
1534.10.11
Handle path conflicts properly
Aaron Bentley 18 years ago Diff Files
1534.10.10
Resolve uses the new stuff.
Aaron Bentley 18 years ago Diff Files
1534.10.9
Switched display functions to conflict_lines
Aaron Bentley 18 years ago Diff Files
1534.10.8
Implemented conflict_lines in terms of old system on Working...
Aaron Bentley 18 years ago Diff Files
1534.10.7
Added tests for bad conflict lists
Aaron Bentley 18 years ago Diff Files
1534.10.6
Conflict serialization working for WorkingTree3
Aaron Bentley 18 years ago Diff Files
1534.10.5
Merged latest from bzr.dev
Aaron Bentley 18 years ago 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