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

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

Rev	Summary	Authors	Date
5246.2.15	Lazy import most things in merge.py, to minimise the impact ... Lazy import most things in merge.py, to minimise the impact of plugins that need to import bzrlib.merge to install a hook.	Andrew Bennetts	14 years ago
5246.2.14	Tidy up some vertical whitespace. Tidy up some vertical whitespace.	Andrew Bennetts	14 years ago
5246.2.13	Fix typo in docstring. Fix typo in docstring.	Andrew Bennetts	14 years ago
5246.2.12	Add assertTreeEntriesEqual to make tests more concise. Add assertTreeEntriesEqual to make tests more concise.	Andrew Bennetts	14 years ago
5246.2.11	Handle partial tree merges, add more tests, refactor tests a... Handle partial tree merges, add more tests, refactor tests a little.	Andrew Bennetts	14 years ago
5246.2.10	Add more tests. Add more tests.	Andrew Bennetts	14 years ago
5246.2.9	Make all the existing tests pass. Make all the existing tests pass.	Andrew Bennetts	14 years ago
5246.2.8	Make most of John's whitebox tests pass, clarify help text. Make most of John's whitebox tests pass, clarify help text.	Andrew Bennetts	14 years ago
5246.2.7	Remove unused variable Remove unused variable	Andrew Bennetts	14 years ago
5246.2.6	Improve some docstrings. Simplify code slightly. Improve some docstrings. Simplify code slightly.	Andrew Bennetts	14 years ago
5246.2.5	Remove obsolete XXX. Remove obsolete XXX.	Andrew Bennetts	14 years ago
5246.2.4	Remove a little bit of duplication. Remove a little bit of duplication.	Andrew Bennetts	14 years ago
5246.2.3	Fix import error in bt.test_merge_into (tests don't pass, th... Fix import error in bt.test_merge_into (tests don't pass, though).	Andrew Bennetts	14 years ago
5246.2.2	Remove a bunch of debug mutters. Remove a bunch of debug mutters.	Andrew Bennetts	14 years ago
5246.2.1	Very rough first draft of cmd_merge_into from bzr-merge-into... Very rough first draft of cmd_merge_into from bzr-merge-into. Passes its blackbox tests.	Andrew Bennetts	14 years ago
5246	(spiv) Treat pywintypes.error as a user error as per OSError... (spiv) Treat pywintypes.error as a user error as per OSError, rather than an internal error (Martin [gz])	Canonical.com Patch ...	14 years ago
5245	(lifeless) Merge from 2.1, (lifeless) Merge from 2.1, fix for closing fd's when a specific file is supplied to status/commit etc. (Robert Collins)	Canonical.com Patch ...	14 years ago
5244	(lifeless) Use the production Launchpad instance for XML-RPC... (lifeless) Use the production Launchpad instance for XML-RPC requests (and also changes existing bug references to remove .edge from them. (Martin [gz])	Canonical.com Patch ...	14 years ago
5243	(lifeless) Merge 2.1 into trunk with a number of fixes inclu... (lifeless) Merge 2.1 into trunk with a number of fixes including pyrex 0.9.9 support. (Robert Collins)	Canonical.com Patch ...	14 years ago
5242	(andrew) Fix AttributeError in RemoteBranch.lock_write after (andrew) Fix AttributeError in RemoteBranch.lock_write after lock_read. (#582781)	Canonical.com Patch ...	14 years ago

Older »