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

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

From Revision 5540.1.7 to 5528

Rev	Summary	Authors	Date
5540.1.7	Add mutter for when we cant find a unique lca, and what revi... Add mutter for when we cant find a unique lca, and what revision we used as a base_rev_id.	Gary van der Merwe	14 years ago
5540.1.6	We just need a set for this. We just need a set for this.	Gary van der Merwe	14 years ago
5540.1.5	Update test to match BranchBuilder change. Update test to match BranchBuilder change.	Gary van der Merwe	14 years ago
5540.1.4	Merged branchbuilder-null into bug483388-criss-cross-null-ba... Merged branchbuilder-null into bug483388-criss-cross-null-base.	Gary van der Merwe	14 years ago
5540.1.3	Make merge correctly locate a lca where there is a criss-cro... Make merge correctly locate a lca where there is a criss-cross merge of a new root.	Gary van der Merwe	14 years ago
5540.1.2	Add a test for bug #588698, for merging a new root more than... Add a test for bug #588698, for merging a new root more than once.	Gary van der Merwe	14 years ago
5540.1.1	Make ``BranchBuilder.build_snapshot`` accept parent_ids == [... Make ``BranchBuilder.build_snapshot`` accept parent_ids == ['null:'].	Gary van der Merwe	14 years ago
5540	(spiv) Remove broken, unused elif branch, (spiv) Remove broken, unused elif branch, and remove some unused imports. (Andrew Bennetts)	Canonical.com Patch ...	14 years ago
5539	(gz) Documentation fixes for its uses of "its" when it's mea... (gz) Documentation fixes for its uses of "its" when it's meaning "it's" (Zearin)	Canonical.com Patch ...	14 years ago
5538	(spiv) Cache a branch's tags during a read-lock. (Andrew Ben... (spiv) Cache a branch's tags during a read-lock. (Andrew Bennetts)	Canonical.com Patch ...	14 years ago
5537	(vila) More feedback about the conflicts just resolved and t... (vila) More feedback about the conflicts just resolved and the remaining ones. (Vincent Ladeuil)	Canonical.com Patch ...	14 years ago
5536	(spiv) Merge lp:bzr/2.2, including fix towards #603395. (And... (spiv) Merge lp:bzr/2.2, including fix towards #603395. (Andrew Bennetts)	Canonical.com Patch ...	14 years ago
5535	(GaryvdM) Exclude SHFOLDER.dll from py2exe builds, (GaryvdM) Exclude SHFOLDER.dll from py2exe builds, as it breaks subvertpy.	Canonical.com Patch ...	14 years ago
5534	(vila) Friendlier message while setting ownership of the ``.... (vila) Friendlier message while setting ownership of the ``.bazaar`` directory (Parth Malwankar)	Canonical.com Patch ...	14 years ago
5533	(vila) Fix news entry (vila) Fix news entry	Canonical.com Patch ...	14 years ago
5532	(vila) Add an option to accept any output from commands in s... (vila) Add an option to accept any output from commands in shell-like tests. (Vincent Ladeuil)	Canonical.com Patch ...	14 years ago
5531	(vila) Merge 2.2 into trunk including fix for bug #646961 (V... (vila) Merge 2.2 into trunk including fix for bug #646961 (Vincent Ladeuil)	Canonical.com Patch ...	14 years ago
5530	(vila) Display only the active value when a single option is... (vila) Display only the active value when a single option is provided to ``bzr config``. (Vincent Ladeuil)	Canonical.com Patch ...	14 years ago
5529	(vila) Catch UnicodeError for optparse parsing (Rory Yorke) (vila) Catch UnicodeError for optparse parsing (Rory Yorke)	Canonical.com Patch ...	14 years ago
5528	(vila) Move NEWS entry into the correct section (Vincent Lad... (vila) Move NEWS entry into the correct section (Vincent Ladeuil)	Canonical.com Patch ...	14 years ago

Older »