/brz/remove-bazaar : changes

» Changes to breezy/conflicts.py from revision 7532

To get this branch, use:

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

From Revision 7532 to 6623

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ĳ	5 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ĳ	5 years ago
7517	Merge lp:brz/3.1. Merge lp:brz/3.1. Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/386223	Jelmer Vernooĳ	5 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
7440	Add a Mercurial prober that mentions that mercurial reposito... Add a Mercurial prober that mentions that mercurial repositories are unsupported. Merged from https://code.launchpad.net/~jelmer/brz/probe-hg/+merge/375181	Jelmer Vernooĳ	5 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
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
7351	Merge 3.0 into trunk resolving conflicts Merge 3.0 into trunk resolving conflicts Merged from https://code.launchpad.net/~vila/brz/trunk/+merge/368964	Vincent Ladeuil	6 years ago
7175	Sprinkle some PEP8iness. Sprinkle some PEP8iness. Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611	Jelmer Vernooĳ	7 years ago
7051	Fix a few more tests on Python 3. Fix a few more tests on Python 3. Merged from https://code.launchpad.net/~jelmer/brz/python3-q/+merge/349833	Jelmer Vernooĳ	7 years ago
7050	Fix some more tests on Python 3. Fix some more tests on Python 3. Merged from https://code.launchpad.net/~jelmer/brz/python3-p/+merge/349784	Jelmer Vernooĳ	7 years ago
6996	Merge lp:~jelmer/brz/python3-e Merge lp:~jelmer/brz/python3-e	Jelmer Vernooĳ	7 years ago
6992	Merge lp:~jelmer/brz/python3-c Merge lp:~jelmer/brz/python3-c	Jelmer Vernooĳ	7 years ago
6819	Merge lp:~jelmer/brz/swap-arguments. Merge lp:~jelmer/brz/swap-arguments.	Jelmer Vernooĳ	8 years ago
6797	Merge lp:~jelmer/brz/fix-imports. Merge lp:~jelmer/brz/fix-imports.	Jelmer Vernooĳ	8 years ago
6775	Merge lp:~jelmer/brz/lock-context. Merge lp:~jelmer/brz/lock-context.	Jelmer Vernooĳ	8 years ago
6639	Remove all deprecated arguments, functions and methods. Remove all deprecated arguments, functions and methods. Merged from https://code.launchpad.net/~jelmer/brz/deprecation/+merge/324814	Jelmer Vernooĳ	8 years ago
6624	Merge Python3 porting work ('py3 pokes') Merge Python3 porting work ('py3 pokes')	Jelmer Vernooĳ	8 years ago
6623	Merge rename to breezy. Merge rename to breezy.	Jelmer Vernooĳ	8 years ago

Older »