~bzr-pqm/bzr/bzr.dev : changes

~bzr-pqm/bzr/bzr.dev » Changes from revision 1185.35.26

Rev	Summary	Authors	Date
1185.35.6	Removed todo, restored test Removed todo, restored test	Aaron Bentley	19 years ago
1185.35.5	Made weave merge succeed if interesting files match history Made weave merge succeed if interesting files match history	Aaron Bentley	19 years ago
1185.35.4	Implemented remerge Implemented remerge	Aaron Bentley	19 years ago
1185.35.3	Handle errors logging errors Handle errors logging errors	Aaron Bentley	19 years ago
1185.35.2	Added early-exit message in merge Added early-exit message in merge	Aaron Bentley	19 years ago
1185.35.1	Implemented conflicts.restore Implemented conflicts.restore	Aaron Bentley	19 years ago
1185.16.13...	[merge] fixes for ls [merge] fixes for ls	Martin Pool	19 years ago
1185.16.13...	[merge] short-option fix and merge --reprocess [merge] short-option fix and merge --reprocess	Martin Pool	19 years ago
1185.16.13...	[merge] win32 fixes [merge] win32 fixes	Martin Pool	19 years ago
1185.16.13...	Prepare for 0.6rc1 Prepare for 0.6rc1	Martin Pool	19 years ago
1185.16.13...	Fix tests Fix tests	Martin Pool	19 years ago
1185.16.12...	Add check that the bzr program and bzrlib version match. Add check that the bzr program and bzrlib version match. This may trap installation errors where bin/bzr is upgraded but not bzrlib, or vice versa. Change new variable to bzrlib.version_info to be consistent with sys.	Martin Pool	19 years ago
1185.16.12...	Expose library API version in bzrlib.bzr_version_info Expose library API version in bzrlib.bzr_version_info similar to sys.version_info. Add tests for this.	Martin Pool	19 years ago
1185.16.12...	[patch] paramiko sftp tests (robey) [patch] paramiko sftp tests (robey)	Martin Pool	19 years ago
1185.16.12...	[merge] Fixes and tests for strict commits (mpe) [merge] Fixes and tests for strict commits (mpe)	Martin Pool	19 years ago
1185.16.12...	Test for 'name in weave' Test for 'name in weave'	Martin Pool	19 years ago
1185.16.12...	Add Weave.__contains__. Add Weave.__contains__.	Martin Pool	19 years ago
1185.16.12...	Fix syntax of serializer_v5.pack_revision_to_string Fix syntax of serializer_v5.pack_revision_to_string *_to_string functions should return strings with a trailing newline. Add tests for this.	Martin Pool	19 years ago
1185.16.12...	[patch] Close test log file before deleting, needed on Windo... [patch] Close test log file before deleting, needed on Windows (Alexander Belchenko)	Martin Pool	19 years ago
1185.16.12...	Sort and clean up list of default ignores Sort and clean up list of default ignores	Martin Pool	19 years ago