/brz/remove-bazaar : changes

» Changes to breezy/tests/blackbox/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 2794

expand all

Rev	Summary	Authors	Date
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ĳ	6 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
7039	Change run_bzr to use StringIOWithEncoding for stderr and st... Change run_bzr to use StringIOWithEncoding for stderr and stdout on python 3. Merged from https://code.launchpad.net/~jelmer/brz/python3-blackbox/+merge/349090	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
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
6043	(mbp) move test feature dependencies into test.features (Mar... (mbp) move test feature dependencies into test.features (Martin Pool)	Canonical.com Patch ...	14 years ago
5909	(gz) Require UnicodeFilenameFeature for new tests in bb.test... (gz) Require UnicodeFilenameFeature for new tests in bb.test_conflicts (Martin [gz])	Canonical.com Patch ...	14 years ago
5907	(gz) Fix unicode handling in bzrlib.conflicts ui code (Marti... (gz) Fix unicode handling in bzrlib.conflicts ui code (Martin [gz])	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
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
5523	(vila) Respect --directory when path parameters are also use... (vila) Respect --directory when path parameters are also used for shelve and restore (Vincent Ladeuil)	Canonical.com Patch ...	14 years ago
5284	(spiv) Add --directory option to 8 more commands. (Martin vo... (spiv) Add --directory option to 8 more commands. (Martin von Gagern)	Canonical.com Patch ...	15 years ago
5023	(Michal Junák) Bug #511987, support 'bzr export FILE' (Michal Junák) Bug #511987, support 'bzr export FILE'	Canonical.com Patch ...	15 years ago
5009	(vila) Add --take-this and --take-other actions to bzr resol... (vila) Add --take-this and --take-other actions to bzr resolve	Canonical.com Patch ...	15 years ago
4193	(mbp) merge update to FSF address (mbp) merge update to FSF address	Canonical.com Patch ...	16 years ago
2794	(dmwatkins,mbp) Clean up test_c* (dmwatkins,mbp) Clean up test_c*	Canonical.com Patch ...	17 years ago

Older »