← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 1185.24.1 to 1185.12.81

expand all expand all

Rev   Summary Authors Date Diff Files
1185.24.1
Got reprocessing working
Aaron Bentley 19 years ago Diff Files
1185.12.99
Handled conflicts with versioned files better
Aaron Bentley 19 years ago Diff Files
1185.12.98
Support for forcing merges of unrelated trees
Aaron Bentley 19 years ago Diff Files
1185.12.97
Updated docs
Aaron Bentley 19 years ago Diff Files
1185.12.96
Merge from mpool
Aaron Bentley 19 years ago Diff Files
1185.12.95
Fixes for default ignores
Aaron Bentley 19 years ago Diff Files
1185.12.94
Added default ignores for Arch, autofoo, compiled files
Aaron Bentley 19 years ago Diff Files
1185.12.93
Fixed obsolete help
Aaron Bentley 19 years ago Diff Files
1185.12.92
Fixed pull help, renamed clobber to overwrite
Aaron Bentley 19 years ago Diff Files
1185.12.91
Fixed exception (No such thing as EncodingError that I can s...
Aaron Bentley 19 years ago Diff Files
1185.12.90
Fixed InvalidRevisionID handling in Branch.get_revision_xml
Aaron Bentley 19 years ago Diff Files
1185.12.89
Improved sort order of indirect merges
Aaron Bentley 19 years ago Diff Files
1185.12.88
Added weave merge conflict to ExceptionConflictHandler
Aaron Bentley 19 years ago Diff Files
1185.12.87
Updated NEWS, error out if --show-base supplied and unsuppor...
Aaron Bentley 19 years ago Diff Files
1185.12.86
Switched to standard 7-char conflict markers
Aaron Bentley 19 years ago Diff Files
1185.12.85
Added conflict handling for weave merges
Aaron Bentley 19 years ago Diff Files
1185.12.84
got merge type selection under test
Aaron Bentley 19 years ago Diff Files
1185.12.83
Preliminary weave merge support
Aaron Bentley 19 years ago Diff Files
1185.12.82
Fix missing import
Aaron Bentley 19 years ago Diff Files
1185.12.81
Restored merge type selection
Aaron Bentley 19 years ago Diff Files