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

~bzr-pqm/bzr/bzr.dev » Changes to bzrlib/merge.py from revision 6622

From Revision 6622 to 5997

Rev	Summary	Authors	Date
6519	(jelmer) Add Tree.iter_child_entries(). (Jelmer Vernooij) (jelmer) Add Tree.iter_child_entries(). (Jelmer Vernooij)	Patch Queue Manager	12 years ago
6501	(vila) Remove some code deprecated in series older than 2.4 ... (vila) Remove some code deprecated in series older than 2.4 (inclusive) (Vincent Ladeuil)	Patch Queue Manager	12 years ago
6474	(jelmer) Use Tree.iter_children() in a couple more places. (... (jelmer) Use Tree.iter_children() in a couple more places. (Jelmer Vernooij)	Patch Queue Manager	12 years ago
6470	(jelmer) Avoid direct access of tree inventories in a couple... (jelmer) Avoid direct access of tree inventories in a couple more places. (Jelmer Vernooij)	Patch Queue Manager	12 years ago
6464	(jelmer) Rename Tree.inventory to Tree.root_inventory. (Jelm... (jelmer) Rename Tree.inventory to Tree.root_inventory. (Jelmer Vernooij)	Patch Queue Manager	12 years ago
6447	(jelmer) Avoid the use of inventories in a few more places. ... (jelmer) Avoid the use of inventories in a few more places. (Jelmer Vernooij)	Patch Queue Manager	12 years ago
6419	(jelmer) Distinguish between working tree and this tree in m... (jelmer) Distinguish between working tree and this tree in merge. (Jelmer Vernooij)	Patch Queue Manager	13 years ago
6416	(jelmer) Add an "other_branch" argument to Merge3Merger. (jelmer) Add an "other_branch" argument to Merge3Merger. (Jelmer Vernooij)	Patch Queue Manager	13 years ago
6395	(jelmer) Add pre_merge and post_merge hooks in Merger.hooks.... (jelmer) Add pre_merge and post_merge hooks in Merger.hooks. (Jelmer Vernooij)	Patch Queue Manager	13 years ago
6389	(jelmer) Remove some merge methods deprecated in bzr 2.1. (J... (jelmer) Remove some merge methods deprecated in bzr 2.1. (Jelmer Vernooij)	Patch Queue Manager	13 years ago
6386	(jelmer) Use the absolute_import feature everywhere in bzrli... (jelmer) Use the absolute_import feature everywhere in bzrlib, and add a source test to make sure it's used everywhere. (Jelmer Vernooij)	Patch Queue Manager	13 years ago
6323	(vila) Smarter .po file merging with merge hook as a plugin:... (vila) Smarter .po file merging with merge hook as a plugin: po_merge (lazy options). (Vincent Ladeuil)	Patch Queue Manager	13 years ago
6322	(vila) Smarter .po file merging with merge hook as a plugin:... (vila) Smarter .po file merging with merge hook as a plugin: po_merge. (Vincent Ladeuil)	Patch Queue Manager	13 years ago
6319	(gz) Move merge_type_registry from bzrlib.options to bzrlib.... (gz) Move merge_type_registry from bzrlib.options to bzrlib.merge (Martin Packman)	Patch Queue Manager	13 years ago
6236	(vila) Merge 2.4 into trunk including fix for bug #880701 (V... (vila) Merge 2.4 into trunk including fix for bug #880701 (Vincent Ladeuil)	Patch Queue Manager	13 years ago
6145	(jr) Add gettext() to progress bar text (jr) Add gettext() to progress bar text (Jonathan Riddell)	Patch Queue Manager	13 years ago
6143	(jr) Add gettext() to uses of note() (Jonathan Riddell) (jr) Add gettext() to uses of note() (Jonathan Riddell)	Patch Queue Manager	13 years ago
6013	(vila) Handle path conflicts involving different root-ids (m... (vila) Handle path conflicts involving different root-ids (merged in from 2.3 + tweaks) (Vincent Ladeuil)	Canonical.com Patch ...	13 years ago
6001	(mbp) remove __contains__ methods from inventory and dict (M... (mbp) remove __contains__ methods from inventory and dict (Martin Pool)	Canonical.com Patch ...	13 years ago
5997	(jelmer) Re-introduce root when merge result is empty tree. ... (jelmer) Re-introduce root when merge result is empty tree. (Jelmer Vernooij)	Canonical.com Patch ...	13 years ago

Older »