/brz/remove-bazaar : changes

» Changes to breezy/tests/test_conflicts.py from revision 7532

To get this branch, use:

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

From Revision 7532 to 6548

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
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
7175	Sprinkle some PEP8iness. Sprinkle some PEP8iness. Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611	Jelmer Vernooĳ	7 years ago
7063	Fix another round of tests on Python 3. Fix another round of tests on Python 3. Merged from https://code.launchpad.net/~jelmer/brz/python3-x/+merge/352226	Jelmer Vernooĳ	7 years ago
7062	Fix a couple of flappy tests. Fix a couple of flappy tests. Merged from https://code.launchpad.net/~jelmer/brz/random/+merge/352328	Jelmer Vernooĳ	7 years ago
7058	Fix another ~400 tests on Python 3. Fix another ~400 tests on Python 3. Merged from https://code.launchpad.net/~jelmer/brz/python3-w/+merge/352048	Jelmer Vernooĳ	7 years ago
7057	Fix some more tests on Python 3. Fix some more tests on Python 3. Merged from https://code.launchpad.net/~jelmer/brz/python3-u/+merge/351386	Jelmer Vernooĳ	7 years ago
7010	Fix another 1.5k tests on python3. Fix another 1.5k tests on python3. Merged from https://code.launchpad.net/~jelmer/brz/python3-j/+merge/348346	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
6929	Change arguments for 'modify' and 'unversion' in BranchBuild... Change arguments for 'modify' and 'unversion' in BranchBuilder.build_snapshot from a file-id to path. Merged from https://code.launchpad.net/~jelmer/brz/conflicts/+merge/341069	Jelmer Vernooĳ	7 years ago
6928	Add more bees. In particular: Add more bees. In particular: * for file ids * for revision ids * for file contents in build_tree_contents() Merged from https://code.launchpad.net/~jelmer/brz/more-bees/+merge/337919	Jelmer Vernooĳ	7 years ago
6818	Merge lp:~jelmer/brz/branch-builder-order Merge lp:~jelmer/brz/branch-builder-order	Jelmer Vernooĳ	8 years ago
6810	Merge lp:~gz/brz/ws_comma Merge lp:~gz/brz/ws_comma	Jelmer Vernooĳ	8 years ago
6734	Move some more errors out of breezy.errors. Move some more errors out of breezy.errors. https://code.launchpad.net/~jelmer/brz/move-errors-1/+merge/327485	Jelmer Vernooĳ	8 years ago
6681	Rename ``bzrdir`` attribute to ``controldir``. Rename ``bzrdir`` attribute to ``controldir``. Merged from https://code.launchpad.net/~jelmer/brz/rename-controldir/+merge/325433	Jelmer Vernooij	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
6548	(gz) Remove deprecated --force option from remove (Martin Pa... (gz) Remove deprecated --force option from remove (Martin Packman)	Patch Queue Manager	13 years ago

Older »