/brz/remove-bazaar : changes

» Changes from revision 4985.3.14

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

From Revision 4985.3.14 to 4980

expand all

Rev	Summary	Authors	Date
4985.3.14	Don't compare old_tip to revision, just do the merge. Don't compare old_tip to revision, just do the merge.	Gerard Krol	15 years ago
4985.3.13	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	15 years ago
4985.3.12	Test for a case where update should remove commits Test for a case where update should remove commits	Gerard Krol	15 years ago
4985.3.11	No need to use "result +=" anymore No need to use "result +=" anymore	Gerard Krol	15 years ago
4985.3.10	Reformat long lines Reformat long lines	Gerard Krol	15 years ago
4985.3.9	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	15 years ago
4985.3.8	Remove an unused local variable that was still lingering Remove an unused local variable that was still lingering	Gerard Krol	15 years ago
4985.3.7	should pass all tests again should pass all tests again	Gerard Krol	15 years ago
4985.3.6	Message after aborting update after the first merge Message after aborting update after the first merge	Gerard Krol	15 years ago
4985.3.5	Reverting some unneeded changes. Reverting some unneeded changes.	Gerard Krol	15 years ago
4985.3.4	Cleaning up Cleaning up	Gerard Krol	15 years ago
4985.3.3	Remove useless test. Remove useless test.	Gerard Krol	15 years ago
4985.3.2	FIXED FIXED	Gerard Krol	15 years ago
4985.3.1	Werkt wel ok Werkt wel ok	Gerard Krol	15 years ago
4985	(vila) Cleanup log tests (vila) Cleanup log tests	Canonical.com Patch ...	15 years ago
4984	(jam) Trivial doc cleanups (jam) Trivial doc cleanups	Canonical.com Patch ...	15 years ago
4983	(nmb) Clarify NEWS entries handling (nmb) Clarify NEWS entries handling	Canonical.com Patch ...	15 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 ...	15 years ago
4981	(John Whitley) implement ! and !! to exclude files from igno... (John Whitley) implement ! and !! to exclude files from ignore rules.	Canonical.com Patch ...	15 years ago
4980	(nmb) Add documentation for multi-parent merges (nmb) Add documentation for multi-parent merges	Canonical.com Patch ...	15 years ago

Older »