~gerard-/bzr/update : changes

~gerard-/bzr/update » Changes from revision 5001

From Revision 5001 to 4982

Rev	Summary	Authors	Date
5001	NEWS item NEWS item	Gerard Krol	14 years ago
5000	Now correctly determine the branch point (instead of some lu... Now correctly determine the branch point (instead of some lucky guesses)	Gerard Krol	14 years ago
4999	Don't compare old_tip to revision, just do the merge. Don't compare old_tip to revision, just do the merge.	Gerard Krol	14 years ago
4998	Pass the new test by doing the first merge with self.basis_t... Pass the new test by doing the first merge with self.basis_tree() as base	Gerard Krol	14 years ago
4997	Test for a case where update should remove commits Test for a case where update should remove commits	Gerard Krol	14 years ago
4996	No need to use "result +=" anymore No need to use "result +=" anymore	Gerard Krol	14 years ago
4995	Reformat long lines Reformat long lines	Gerard Krol	14 years ago
4994	Use assertFileEqual in the tests, instead of opening them an... Use assertFileEqual in the tests, instead of opening them and looking at the contents. TODO: check if this does work on Windows (due to possible \r\n line endings)?	Gerard Krol	14 years ago
4993	Remove an unused local variable that was still lingering Remove an unused local variable that was still lingering	Gerard Krol	14 years ago
4992	should pass all tests again should pass all tests again	Gerard Krol	14 years ago
4991	Message after aborting update after the first merge Message after aborting update after the first merge	Gerard Krol	14 years ago
4990	Reverting some unneeded changes. Reverting some unneeded changes.	Gerard Krol	14 years ago
4989	Cleaning up Cleaning up	Gerard Krol	14 years ago
4988	Remove useless test. Remove useless test.	Gerard Krol	14 years ago
4987	FIXED FIXED	Gerard Krol	14 years ago
4986	Werkt wel ok Werkt wel ok	Gerard Krol	14 years ago
4985	(vila) Cleanup log tests (vila) Cleanup log tests	Canonical.com Patch ...	14 years ago
4984	(jam) Trivial doc cleanups (jam) Trivial doc cleanups	Canonical.com Patch ...	14 years ago
4983	(nmb) Clarify NEWS entries handling (nmb) Clarify NEWS entries handling	Canonical.com Patch ...	14 years ago
4982	(jam) Merge 2.1.0rc1 and start 2.2.0b1 (jam) Merge 2.1.0rc1 and start 2.2.0b1	Canonical.com Patch ...	14 years ago

Older »