← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 1551.6.15 to 1551.2.45

expand all expand all

Rev   Summary Authors Date Diff Files
1551.6.15
Moved plan_merge into Weave
Aaron Bentley 18 years ago Diff Files
1551.6.14
Tweaks from merge review
Aaron Bentley 18 years ago Diff Files
1551.6.13
Cleanup
Aaron Bentley 18 years ago Diff Files
1551.6.12
Indicate conflicts from merge_lines, insead of guessing
Aaron Bentley 18 years ago Diff Files
1551.6.11
Switched TextMerge_lines to work on a list
Aaron Bentley 18 years ago Diff Files
1551.6.10
Renamed WeaveMerge to PlanMerge, added plan method, created ...
Aaron Bentley 18 years ago Diff Files
1551.6.9
Moved merge tests into blackbox/test_merge
Aaron Bentley 18 years ago Diff Files
1551.6.8
Implemented reprocess for weave
Aaron Bentley 18 years ago Diff Files
1551.6.7
Implemented two-way merge, refactored weave merge
Aaron Bentley 18 years ago Diff Files
1551.6.6
Cleanup
Aaron Bentley 18 years ago Diff Files
1551.6.5
Got weave merge producing structural output
Aaron Bentley 18 years ago Diff Files
1551.6.4
Merge from bzr.ab.integration
Aaron Bentley 18 years ago Diff Files
1551.6.3
Updated from dev
Aaron Bentley 18 years ago Diff Files
1551.6.2
Added explanatory comment
Aaron Bentley 18 years ago Diff Files
1551.6.1
Shortened temp dir filenames
abentley 18 years ago Diff Files
1551.2.49
Made ConfigObj output binary-identical files on win32 and *n...
abentley 18 years ago Diff Files
1551.2.48
Used ensure_config_dir exists instead of makedirs
abentley 18 years ago Diff Files
1551.2.47
Fixed test_selftest's use of sftp
abentley 18 years ago Diff Files
1551.2.46
Made bzr missing . work on win32
abentley 18 years ago Diff Files
1551.2.45
Fixed outside working tree tests
abentley 18 years ago Diff Files