/brz/remove-bazaar : changes

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

To get this branch, use:

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

From Revision 7532 to 3594

expand all

Rev	Summary	Authors	Date
7175	Sprinkle some PEP8iness. Sprinkle some PEP8iness. Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611	Jelmer Vernooĳ	6 years ago
7038	Add some more bees; support writing both bytes and unicode s... Add some more bees; support writing both bytes and unicode strings in build_tree_contents. Merged from https://code.launchpad.net/~jelmer/brz/python3-n/+merge/349091	Jelmer Vernooĳ	6 years ago
7036	Fix some merge tests on Python 3. Fix some merge tests on Python 3. Merged from https://code.launchpad.net/~jelmer/brz/python3-merge/+merge/349097	Jelmer Vernooĳ	6 years ago
7033	Port diff and merge_directive to Python 3. Port diff and merge_directive to Python 3. Merged from https://code.launchpad.net/~jelmer/brz/python3-diff/+merge/349216	Jelmer Vernooĳ	6 years ago
7025	Fix more tests on Python3. Fix more tests on Python3. Merged from https://code.launchpad.net/~jelmer/brz/python3-l/+merge/348782	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
6992	Merge lp:~jelmer/brz/python3-c Merge lp:~jelmer/brz/python3-c	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
6926	Add more bees in places, get more tests to pass on Python 3. Add more bees in places, get more tests to pass on Python 3. Merged from https://code.launchpad.net/~jelmer/brz/bees/+merge/337908	Jelmer Vernooĳ	7 years ago
6799	Merge lp:~jelmer/brz/escaping. Merge lp:~jelmer/brz/escaping.	Jelmer Vernooĳ	7 years ago
6729	Switch to using python-gpg (part of gpgme) rather than depre... Switch to using python-gpg (part of gpgme) rather than deprecated python-gpgme. Merged from https://code.launchpad.net/~jelmer/brz/gpg/+merge/326815	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
6468	(vila) Cache the branch config store to avoid useless IOs. (... (vila) Cache the branch config store to avoid useless IOs. (Vincent Ladeuil)	Patch Queue Manager	13 years ago
6428	(vila) Migrate more branch config options to config stacks. ... (vila) Migrate more branch config options to config stacks. (Vincent Ladeuil)	Patch Queue Manager	13 years ago
6370	(jelmer) Switch the commit code over to use config stacks. (... (jelmer) Switch the commit code over to use config stacks. (Bazaar Developers)	Patch Queue Manager	13 years ago
4351	(abentley) add new merge_request_body hook (abentley) add new merge_request_body hook	Canonical.com Patch ...	16 years ago
4193	(mbp) merge update to FSF address (mbp) merge update to FSF address	Canonical.com Patch ...	16 years ago
3594	Give a more specific error when target branch unreachable (J... Give a more specific error when target branch unreachable (James Westby)	Canonical.com Patch ...	16 years ago

Older »