/brz/remove-bazaar : changes

» Changes to breezy/merge.py from revision 7532

To get this branch, use:

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

From Revision 7532 to 7285

expand all

Rev	Summary	Authors	Date
7521	Merge lp:brz/3.1. Merge lp:brz/3.1. Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690	Jelmer Vernooĳ	4 years ago
7519	Merge lp:brz/3.1. Merge lp:brz/3.1. Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/387628	Jelmer Vernooĳ	4 years ago
7493	Drop unnecessary imports from __future__. Drop unnecessary imports from __future__. Merged from https://code.launchpad.net/~jelmer/brz/drop-future/+merge/379372	Jelmer Vernooĳ	5 years ago
7492	Drop python2 support. Drop python2 support. Merged from https://code.launchpad.net/~jelmer/brz/no-more-python2/+merge/378694	Jelmer Vernooĳ	5 years ago
7462	Add a 'lines' storage kind. Add a 'lines' storage kind. Merged from https://code.launchpad.net/~jelmer/brz/file-content-factory/+merge/378072	Jelmer Vernooĳ	5 years ago
7451	Move tree reference info functions to workingtree. Move tree reference info functions to workingtree. Merged from https://code.launchpad.net/~jelmer/brz/move-reference-functions/+merge/377800	Jelmer Vernooĳ	5 years ago
7402	Remove Tree.has_id. Remove Tree.has_id. Merged from https://code.launchpad.net/~jelmer/brz/remove-unused/+merge/373320	Jelmer Vernooĳ	5 years ago
7400	Add a new ``TreeEntry.is_unmodified`` method, which allows Add a new ``TreeEntry.is_unmodified`` method, which allows merge to check for unmodified files without relying on the .revision attribute that is not available for Git trees. This fixes LCA merges for Git repositories. Merged from https://code.launchpad.net/~jelmer/brz/ie-is-same/+merge/373715	Jelmer Vernooĳ	5 years ago
7396	Use id2path in fewer places; instead use paths. Use id2path in fewer places; instead use paths. Merged from https://code.launchpad.net/~jelmer/brz/less-id2path-1/+merge/373061	Jelmer Vernooĳ	5 years ago
7378	Use contextlib.ExitStack rather than our homegrown Operation... Use contextlib.ExitStack rather than our homegrown OperationWithCleanups. Merged from https://code.launchpad.net/~jelmer/brz/exitstack/+merge/369203	Jelmer Vernooĳ	5 years ago
7376	Remove Tree.get_root_id() in favour of Tree.path2id(''). Remove Tree.get_root_id() in favour of Tree.path2id(''). Merged from https://code.launchpad.net/~jelmer/brz/get-root-id/+merge/369477	Jelmer Vernooĳ	5 years ago
7357	Drop file_id attribute from MergeHookParams and Tree.plan_fi... Drop file_id attribute from MergeHookParams and Tree.plan_file_merge. Merged from https://code.launchpad.net/~jelmer/brz/objects-2c/+merge/368932	Jelmer Vernooĳ	6 years ago
7356	Remove file_id from transform's create_from_tree, get filter... Remove file_id from transform's create_from_tree, get filter tree paths by path. Merged from https://code.launchpad.net/~jelmer/brz/objects-2b/+merge/368930	Jelmer Vernooĳ	6 years ago
7355	Use paths as keys in merge_modified dictionary. Use paths as keys in merge_modified dictionary. Merged from https://code.launchpad.net/~jelmer/brz/objects-2a/+merge/368929	Jelmer Vernooĳ	6 years ago
7354	Add a Tree.get_transform method. Add a Tree.get_transform method. Merged from https://code.launchpad.net/~jelmer/brz/get-transform/+merge/368948	Jelmer Vernooĳ	6 years ago
7353	Drop file_id return value from Tree.iter_references. Drop file_id return value from Tree.iter_references. Merged from https://code.launchpad.net/~jelmer/brz/iter-references/+merge/368977	Jelmer Vernooĳ	6 years ago
7334	Use the new attributes on TreeChange rather than indexing. Use the new attributes on TreeChange rather than indexing. Merged from https://code.launchpad.net/~jelmer/brz/objects-1/+merge/368859	Jelmer Vernooĳ	6 years ago
7314	Avoid using inventories in breezy.merge when encountering lc... Avoid using inventories in breezy.merge when encountering lcas. Merged from https://code.launchpad.net/~jelmer/brz/lca-merge-git/+merge/367321	Jelmer Vernooĳ	6 years ago
7303	Use external patiencediff. Use external patiencediff. Merged from https://code.launchpad.net/~jelmer/brz/external-patiencediff/+merge/363891	Jelmer Vernooĳ	6 years ago
7285	Move .generate_ids to breezy.bzr. Move .generate_ids to breezy.bzr. Merged from https://code.launchpad.net/~jelmer/brz/move-generate-ids/+merge/362711	Jelmer Vernooĳ	6 years ago

Older »