← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 1185.35.13 to 1185.16.128

expand all expand all

Rev   Summary Authors Date Diff Files
1185.35.13
Merged Martin
Aaron Bentley 19 years ago Diff Files
1185.35.12
Got writes of existing tree configs working.
Aaron Bentley 19 years ago Diff Files
1185.35.11
Added support for branch nicks
Aaron Bentley 19 years ago Diff Files
1185.35.10
Error when run with -OO
Aaron Bentley 19 years ago Diff Files
1185.35.9
Merge from mainline
Aaron Bentley 19 years ago Diff Files
1185.35.8
Merged me
Aaron Bentley 19 years ago Diff Files
1185.35.7
Fixed weave conflict handling
Aaron Bentley 19 years ago Diff Files
1185.35.6
Removed todo, restored test
Aaron Bentley 19 years ago Diff Files
1185.35.5
Made weave merge succeed if interesting files match history
Aaron Bentley 19 years ago Diff Files
1185.35.4
Implemented remerge
Aaron Bentley 19 years ago Diff Files
1185.35.3
Handle errors logging errors
Aaron Bentley 19 years ago Diff Files
1185.35.2
Added early-exit message in merge
Aaron Bentley 19 years ago Diff Files
1185.35.1
Implemented conflicts.restore
Aaron Bentley 19 years ago Diff Files
1185.16.13...
[merge] fixes for ls
Martin Pool 19 years ago Diff Files
1185.16.13...
[merge] short-option fix and merge --reprocess
Martin Pool 19 years ago Diff Files
1185.16.13...
[merge] win32 fixes
Martin Pool 19 years ago Diff Files
1185.16.13...
Prepare for 0.6rc1
Martin Pool 19 years ago Diff Files
1185.16.13...
Fix tests
Martin Pool 19 years ago Diff Files
1185.16.12...
Add check that the bzr program and bzrlib version match.
Martin Pool 19 years ago Diff Files
1185.16.12...
Expose library API version in bzrlib.bzr_version_info
Martin Pool 19 years ago Diff Files