/brz/remove-bazaar : changes

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

To get this branch, use:

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

From Revision 7532 to 1889

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
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
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
6810	Merge lp:~gz/brz/ws_comma Merge lp:~gz/brz/ws_comma	Jelmer Vernooĳ	7 years ago
6797	Merge lp:~jelmer/brz/fix-imports. Merge lp:~jelmer/brz/fix-imports.	Jelmer Vernooĳ	7 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
6615	(vila) Release 2.7.0 (Vincent Ladeuil) (vila) Release 2.7.0 (Vincent Ladeuil)	Patch Queue Manager	9 years ago
5599	(jameinel) Allow commits to stacked branches (John A Meinel) (jameinel) Allow commits to stacked branches (John A Meinel)	Canonical.com Patch ...	14 years ago
5588	(jelmer) Remove some unused imports in the test code. (Jelme... (jelmer) Remove some unused imports in the test code. (Jelmer Vernooij)	Canonical.com Patch ...	14 years ago
5404	(vila) Cleanups in bzrlib.transform.py (Vincent Ladeuil) (vila) Cleanups in bzrlib.transform.py (Vincent Ladeuil)	Canonical.com Patch ...	14 years ago
5185	(vila) Various test cleanups and copyright updates (vila) Various test cleanups and copyright updates	Canonical.com Patch ...	15 years ago
5181	(vila) Extend Merge3 API to also work with objects rather th... (vila) Extend Merge3 API to also work with objects rather than text lines. (Andrew Bennetts)	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
4033	(Marius Kruger) Remove all trailing whitespace and add tests... (Marius Kruger) Remove all trailing whitespace and add tests to enforce this.	Canonical.com Patch ...	16 years ago
3279	(jam) Implement Cherrypick support for Merge3 (jam) Implement Cherrypick support for Merge3	Canonical.com Patch ...	17 years ago
2353	Merge autodetects line ending for conflict markers Merge autodetects line ending for conflict markers	Canonical.com Patch ...	18 years ago
2080	(John Arbash Meinel) Cleanup copyright and license statement... (John Arbash Meinel) Cleanup copyright and license statements	Canonical.com Patch ...	18 years ago
1889	Copyright statements use # to start all lines Copyright statements use # to start all lines	Canonical.com Patch ...	18 years ago

Older »